Skip to content

Commit 19574c0

Browse files
mohitsumandgolovin
andauthored
Support OpenShift local 2.4.1 (#2453)
* add support for OpenShift local 2.4.1 Signed-off-by: Mohit Suman <mohit.skn@gmail.com> * Fix description * Fix OpenShift Local caps in product name Co-authored-by: Denis Golovin <dgolovin@users.noreply.github.com>
1 parent f1ab901 commit 19574c0

File tree

2 files changed

+20
-21
lines changed

2 files changed

+20
-21
lines changed

src/webview/cluster/app/cluster.tsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,18 @@ const useStyles = makeStyles(clusterStyle);
2727
const clusterTypes = [
2828
{
2929
heading: 'Deploy it locally on your laptop',
30-
description: 'Install on Laptop: Red Hat CodeReady Containers.',
30+
description: 'Install on Laptop: Red Hat OpenShift Local (formerly Red Hat CodeReady Containers)',
3131
smallInfo: 'Create a minimal OpenShift 4 cluster on your desktop/laptop for local development and testing.',
3232
imageUrl: ['https://www.openshift.com/hubfs/images/icons/Icon-Red_Hat-Hardware-Laptop-A-Black-RGB.svg'],
3333
urlAlt: 'crc',
3434
redirectLink: '',
3535
buttonText: 'Create/Refresh cluster',
36-
tooltip: 'You can create/run local OpenShift 4 cluster using this wizard.'
36+
tooltip: 'Create/Run local OpenShift 4 cluster using the guided workflow'
3737
},
3838
{
3939
heading: 'Launch Developer Sandbox',
4040
description: 'Free access to the Developer Sandbox for Red Hat OpenShift',
41-
smallInfo: 'The sandbox provides you with a private OpenShift environment in a shared, multi-tenant OpenShift cluster that is pre-configured with a set of developer tools.',
41+
smallInfo: 'If you are exploring how to run your code as containers in OpenShift, our free Developer Sandbox instantly gives you a way to try it out.',
4242
imageUrl: ['https://assets.openshift.com/hubfs/images/logos/osh/Logo-Red_Hat-OpenShift-A-Standard-RGB.svg'],
4343
urlAlt: 'dev sandbox',
4444
redirectLink: '',
@@ -151,7 +151,7 @@ export default function Header() {
151151
<div className={classes.rowBody}>
152152
<Card className={classes.cardContent}>
153153
<Typography variant="body2" component="p" style={{ padding: 20 }}>
154-
Red Hat CodeReady Containers brings a minimal OpenShift 4 cluster to your local computer.<br></br>You can use this wizard to create OpenShift cluster locally. Cluster take approximately 15 minutes to provision.
154+
Red Hat OpenShift Local brings a minimal OpenShift 4 cluster to your local computer.<br></br>You can use this guided workflow to create OpenShift cluster locally. Cluster take approximately 15 minutes to provision.
155155
</Typography>
156156
<AddClusterView vscode={vscodeApi} />
157157
</Card>

src/webview/cluster/app/clusterView.tsx

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,14 @@ const crcDefaults = {
5353

5454
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
5555
function getSteps() {
56-
return ['CodeReady Containers archive', 'File path of image pull secret', 'Select optional configurations', 'Setup CRC', 'Start the cluster'];
56+
return ['Download OpenShift Local', 'File path of image pull secret', 'Select optional configurations', 'Setup OpenShift Local', 'Start the cluster'];
5757
}
5858

5959
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
6060
export default function addClusterView(props) {
6161
const classes = useStyles();
62-
const crcLatest = '1.40.0';
63-
const crcOpenShift = '4.9.18';
62+
const crcLatest = '2.4.1';
63+
const crcOpenShift = '4.10.14';
6464
const [fileName, setBinaryPath] = React.useState('');
6565
const [pullSecretPath, setSecret] = React.useState('');
6666
const [cpuSize, setCpuSize] = React.useState(crcDefaults.DefaultCPUs);
@@ -218,15 +218,15 @@ export default function addClusterView(props) {
218218
};
219219

220220
const handleDisabled = () => {
221-
return (activeStep === 1 && fileName === '')
221+
return (activeStep === 1 && fileName === '')
222222
|| (activeStep === 2 && pullSecretPath === '');
223223
};
224224

225225
const handleStopProcess = () => {
226226
setStopProgress(true);
227227
setCrcStopError(false);
228228
props.vscode.postMessage({
229-
action: 'crcStop',
229+
action: 'crcStop',
230230
data: {
231231
tool: fileName
232232
}
@@ -339,7 +339,7 @@ export default function addClusterView(props) {
339339
<div className={classes.column}>
340340
<List dense>
341341
<ListItem>
342-
<ListItemText primary={<span>CodeReady Containers Status: {status.crcStatus}</span>}/>
342+
<ListItemText primary={<span>OpenShift Local Status: {status.crcStatus}</span>}/>
343343
</ListItem>
344344
<ListItem>
345345
<ListItemText primary={<span>OpenShift Status: {status.openshiftStatus}</span>}/>
@@ -396,7 +396,7 @@ export default function addClusterView(props) {
396396
)}
397397
{(statusSkeleton && !statusError) && (
398398
<div>
399-
<Typography paragraph>Refreshing the crc status</Typography>
399+
<Typography paragraph>Refreshing the OpenShift Local status</Typography>
400400
<LinearProgress />
401401
</div>
402402
)}
@@ -461,7 +461,7 @@ export default function addClusterView(props) {
461461
case 0:
462462
return (
463463
<div>
464-
<Typography>Download and extract the CodeReady Containers archive for your operating system and place the executable in your $PATH</Typography>
464+
<Typography>Download and open the OpenShift Local file. Opening the file will automatically start a step-by-step installation guide.</Typography>
465465
<List className={classes.uploadLabel}>
466466
<ListItem>
467467
<ListItemAvatar>
@@ -471,15 +471,14 @@ export default function addClusterView(props) {
471471
</ListItemAvatar>
472472
<ListItemText
473473
primary="Download"
474-
secondary={<span>This will download the CodeReady Containers {crcLatest} archive</span>}/>
474+
secondary={<span>This will download OpenShift Local {crcLatest}</span>}/>
475475
<a href={fetchDownloadBinary()} style={{ textDecoration: 'none'}}>
476476
<Button
477477
color="default"
478478
component="span"
479479
className={classes.button}
480-
startIcon={<GetApp />}
481480
>
482-
Download
481+
Download OpenShift Local
483482
</Button>
484483
</a>
485484
</ListItem>
@@ -492,7 +491,7 @@ export default function addClusterView(props) {
492491
</ListItemAvatar>
493492
<ListItemText
494493
primary={<span>Executable Location<sup style={{color: '#BE0000'}}>*</sup></span>}
495-
secondary={<span>Provide the CodeReady Containers {crcLatest} executable location</span>} />
494+
secondary={<span>Provide the OpenShift Local {crcLatest} executable location</span>} />
496495
<div>
497496
<input
498497
style={{ display: 'none' }}
@@ -612,7 +611,7 @@ export default function addClusterView(props) {
612611
<List>
613612
<ListItem>
614613
<ListItemText
615-
primary={<span>Set up your host operating system for the CodeReady Containers virtual machine</span>}
614+
primary={<span>Set up your host operating system for the OpenShift Local virtual machine</span>}
616615
secondary={<span>Once the setup process is successful, then proceed to start the cluster in Next step.</span>} />
617616
<Button
618617
onClick={handleCrcSetup}
@@ -624,7 +623,7 @@ export default function addClusterView(props) {
624623
case 4:
625624
return (
626625
<Typography>
627-
Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster to your local computer.
626+
Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster on your computer.
628627
</Typography>)
629628
default:
630629
return 'Unknown step';
@@ -635,7 +634,7 @@ export default function addClusterView(props) {
635634
<Paper elevation={3}>
636635
<blockquote className={classes.blockquoteText}>
637636
<Typography variant="body2" component="p" style={{textAlign: 'center'}}>
638-
Install OpenShift {crcOpenShift} on your system using CodeReady Containers {crcLatest}.
637+
Install OpenShift {crcOpenShift} on your system using OpenShift Local {crcLatest}.
639638
</Typography>
640639
</blockquote>
641640
<Stepper activeStep={activeStep} orientation="vertical">
@@ -697,7 +696,7 @@ export default function addClusterView(props) {
697696
<Paper square elevation={3} className={classes.resetContainer}>
698697
<blockquote className={classes.blockquoteText}>
699698
<Typography variant='body2'>
700-
CRC configuration is detected in workspace settings. If you need to setup a new CRC instance, click on Reset and proceed with wizard workflow.
699+
OpenShift Local configuration is detected in workspace settings. If you need to setup a new OpenShift Local instance, click on Reset and proceed with guided workflow.
701700
</Typography>
702701
</blockquote>
703702
<StartStopLoader />
@@ -709,4 +708,4 @@ export default function addClusterView(props) {
709708
)}
710709
</div>
711710
);
712-
}
711+
}

0 commit comments

Comments
 (0)