Skip to content

Support OpenShift local 2.4.1 #2453

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgolovin merged 7 commits into from
Jun 17, 2022
Merged

Support OpenShift local 2.4.1 #2453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
36c95a9
Merge pull request #7 from redhat-developer/master
mohitsuman Oct 22, 2021
e8876dd
Merge branch 'redhat-developer:master' into master
mohitsuman Jan 27, 2022
9ac479a
Merge branch 'master' of https://github.com/mohitsuman/vscode-openshi…
mohitsuman Jun 16, 2022
c08b8be
Merge branch 'main' of https://github.com/redhat-developer/vscode-ope…
mohitsuman Jun 16, 2022
dd08131
add support for OpenShift local 2.4.1
mohitsuman Jun 16, 2022
06a842e
Fix description
dgolovin Jun 17, 2022
43d3a6b
Fix OpenShift Local caps in product name
dgolovin Jun 17, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/webview/cluster/app/cluster.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ const useStyles = makeStyles(clusterStyle);
const clusterTypes = [
{
heading: 'Deploy it locally on your laptop',
description: 'Install on Laptop: Red Hat CodeReady Containers.',
description: 'Install on Laptop: Red Hat OpenShift Local (formerly Red Hat CodeReady Containers)',
smallInfo: 'Create a minimal OpenShift 4 cluster on your desktop/laptop for local development and testing.',
imageUrl: ['https://www.openshift.com/hubfs/images/icons/Icon-Red_Hat-Hardware-Laptop-A-Black-RGB.svg'],
urlAlt: 'crc',
redirectLink: '',
buttonText: 'Create/Refresh cluster',
tooltip: 'You can create/run local OpenShift 4 cluster using this wizard.'
tooltip: 'Create/Run local OpenShift 4 cluster using the guided workflow'
},
{
heading: 'Launch Developer Sandbox',
description: 'Free access to the Developer Sandbox for Red Hat OpenShift',
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.',
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.',
imageUrl: ['https://assets.openshift.com/hubfs/images/logos/osh/Logo-Red_Hat-OpenShift-A-Standard-RGB.svg'],
urlAlt: 'dev sandbox',
redirectLink: '',
Expand Down Expand Up @@ -151,7 +151,7 @@ export default function Header() {
<div className={classes.rowBody}>
<Card className={classes.cardContent}>
<Typography variant="body2" component="p" style={{ padding: 20 }}>
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.
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.
</Typography>
<AddClusterView vscode={vscodeApi} />
</Card>
Expand Down
33 changes: 16 additions & 17 deletions src/webview/cluster/app/clusterView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,14 +53,14 @@ const crcDefaults = {

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

// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
export default function addClusterView(props) {
const classes = useStyles();
const crcLatest = '1.40.0';
const crcOpenShift = '4.9.18';
const crcLatest = '2.4.1';
const crcOpenShift = '4.10.14';
const [fileName, setBinaryPath] = React.useState('');
const [pullSecretPath, setSecret] = React.useState('');
const [cpuSize, setCpuSize] = React.useState(crcDefaults.DefaultCPUs);
Expand Down Expand Up @@ -218,15 +218,15 @@ export default function addClusterView(props) {
};

const handleDisabled = () => {
return (activeStep === 1 && fileName === '')
return (activeStep === 1 && fileName === '')
|| (activeStep === 2 && pullSecretPath === '');
};

const handleStopProcess = () => {
setStopProgress(true);
setCrcStopError(false);
props.vscode.postMessage({
action: 'crcStop',
action: 'crcStop',
data: {
tool: fileName
}
Expand Down Expand Up @@ -339,7 +339,7 @@ export default function addClusterView(props) {
<div className={classes.column}>
<List dense>
<ListItem>
<ListItemText primary={<span>CodeReady Containers Status: {status.crcStatus}</span>}/>
<ListItemText primary={<span>OpenShift Local Status: {status.crcStatus}</span>}/>
</ListItem>
<ListItem>
<ListItemText primary={<span>OpenShift Status: {status.openshiftStatus}</span>}/>
Expand Down Expand Up @@ -396,7 +396,7 @@ export default function addClusterView(props) {
)}
{(statusSkeleton && !statusError) && (
<div>
<Typography paragraph>Refreshing the crc status</Typography>
<Typography paragraph>Refreshing the OpenShift Local status</Typography>
<LinearProgress />
</div>
)}
Expand Down Expand Up @@ -461,7 +461,7 @@ export default function addClusterView(props) {
case 0:
return (
<div>
<Typography>Download and extract the CodeReady Containers archive for your operating system and place the executable in your $PATH</Typography>
<Typography>Download and open the OpenShift Local file. Opening the file will automatically start a step-by-step installation guide.</Typography>
<List className={classes.uploadLabel}>
<ListItem>
<ListItemAvatar>
Expand All @@ -471,15 +471,14 @@ export default function addClusterView(props) {
</ListItemAvatar>
<ListItemText
primary="Download"
secondary={<span>This will download the CodeReady Containers {crcLatest} archive</span>}/>
secondary={<span>This will download OpenShift Local {crcLatest}</span>}/>
<a href={fetchDownloadBinary()} style={{ textDecoration: 'none'}}>
<Button
color="default"
component="span"
className={classes.button}
startIcon={<GetApp />}
>
Download
Download OpenShift Local
</Button>
</a>
</ListItem>
Expand All @@ -492,7 +491,7 @@ export default function addClusterView(props) {
</ListItemAvatar>
<ListItemText
primary={<span>Executable Location<sup style={{color: '#BE0000'}}>*</sup></span>}
secondary={<span>Provide the CodeReady Containers {crcLatest} executable location</span>} />
secondary={<span>Provide the OpenShift Local {crcLatest} executable location</span>} />
<div>
<input
style={{ display: 'none' }}
Expand Down Expand Up @@ -612,7 +611,7 @@ export default function addClusterView(props) {
<List>
<ListItem>
<ListItemText
primary={<span>Set up your host operating system for the CodeReady Containers virtual machine</span>}
primary={<span>Set up your host operating system for the OpenShift Local virtual machine</span>}
secondary={<span>Once the setup process is successful, then proceed to start the cluster in Next step.</span>} />
<Button
onClick={handleCrcSetup}
Expand All @@ -624,7 +623,7 @@ export default function addClusterView(props) {
case 4:
return (
<Typography>
Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster to your local computer.
Start the cluster. This will create a minimal OpenShift {crcOpenShift} cluster on your computer.
</Typography>)
default:
return 'Unknown step';
Expand All @@ -635,7 +634,7 @@ export default function addClusterView(props) {
<Paper elevation={3}>
<blockquote className={classes.blockquoteText}>
<Typography variant="body2" component="p" style={{textAlign: 'center'}}>
Install OpenShift {crcOpenShift} on your system using CodeReady Containers {crcLatest}.
Install OpenShift {crcOpenShift} on your system using OpenShift Local {crcLatest}.
</Typography>
</blockquote>
<Stepper activeStep={activeStep} orientation="vertical">
Expand Down Expand Up @@ -697,7 +696,7 @@ export default function addClusterView(props) {
<Paper square elevation={3} className={classes.resetContainer}>
<blockquote className={classes.blockquoteText}>
<Typography variant='body2'>
CRC configuration is detected in workspace settings. If you need to setup a new CRC instance, click on Reset and proceed with wizard workflow.
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.
</Typography>
</blockquote>
<StartStopLoader />
Expand All @@ -709,4 +708,4 @@ export default function addClusterView(props) {
)}
</div>
);
}
}
⚡