From 7264bd3686e7fc397008fc79da1f0bb66fd6a900 Mon Sep 17 00:00:00 2001 From: Mohit Suman Date: Sat, 30 Oct 2021 05:35:34 +0530 Subject: [PATCH] fix macos and windows path for crc 1.34.0 (#2279) * fix macos and windows path for crc 1.34.0 Signed-off-by: Mohit Suman * fix space Signed-off-by: Mohit Suman --- README.md | 11 ++++------- package.json | 21 ++++++++++++--------- src/webview/cluster/app/clusterView.tsx | 4 ++-- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index 09d242b2f..1021f6980 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ OpenShift Connector extension provides an end-to-end developer experience for Red Hat® OpenShift®. Using this extension: - Developers can easily create, deploy and live debug container applications running on OpenShift. - - Run local instance of OpenShift 4.7 using [Red Hat CodeReady Containers](https://code-ready.github.io/crc/). + - Run local instance of OpenShift 4.9.0 using [Red Hat CodeReady Containers](https://crc.dev/crc/). ### Demo: https://www.youtube.com/watch?v=HEsYgDqD1rM @@ -29,9 +29,6 @@ This extension can work with local or remote OpenShift clusters. To provision local instance of OpenShift cluster, developers can use the following options: * [Red Hat CodeReady Containers](https://crc.dev/crc/) - run single node local OpenShift 4.x cluster -* [minishift](http://bit.ly/3rSvzOx) / [CDK](http://red.ht/3opF1XC) - run single node local OpenShift 3.x cluster - -For detail analysis of how to setup and run local OpenShift Cluster using minishift, please follow this [wiki](http://bit.ly/3be4jUv). #### Public cloud providers @@ -47,7 +44,7 @@ To install OpenShift Container Platform 4 in the public cloud, in your datacente * `Application`: An application is a program designed for end users. An application consists of multiple microservices or components that work individually to build the entire application. Examples of applications: e-Shop, Hotel Reservation System, Online Booking * `Component`: A component is a set of Kubernetes resources which host code or data. Each component can be run and deployed separately. Examples of components: Warehouse API Backend, Inventory API, Web Frontend, Payment Backend * `Service`: A service is software that your component links to or depends on. Examples of services: MariaDB, MySQL -* `Devfile`: A portable file responsible for your entire reproducable development environment +* `Devfile`: A devfile is a portable YAML file containing the definition of a component and its related URLs, storages and services. ## Commands and Features @@ -114,7 +111,7 @@ Components in different states have different set of commands available. * `Push` - Push the source code to a Component. * `Watch` - Watch for changes, update Component on change. This is not supported for git based components. * `Undeploy` - Undeploys a Component from the cluster. The component still resides in the local config. - * `Debug` - Debug local Java or Node.js Component. + * `Debug` - Debug local Java, Node.js and Python Component. * `Test` - Run test for the Component in cluster. * `Reveal in Explorer` - Show Component's context folder in Explorer view * `Delete` - Delete existing Component from the cluster and removes the local config also. @@ -231,7 +228,7 @@ OpenShift Connector extension provides ```Use Project``` command to switch betwe **NOTE:** This extension is in Preview mode. The extension support for OpenShift is strictly experimental - assumptions may break, commands and behavior may change! -**NOTE:** CRC (Red Hat CodeReady Containers) version supported by the extension is `1.23.1` (OpenShift Version: `4.7.0`) +**NOTE:** CRC (Red Hat CodeReady Containers) version supported by the extension is `1.34.0` (OpenShift Version: `4.9.0`) ## Dependencies diff --git a/package.json b/package.json index 52af172f1..c581beba4 100644 --- a/package.json +++ b/package.json @@ -38,17 +38,20 @@ } ], "categories": [ - "Other" + "Other", + "Debuggers" ], "keywords": [ - "openshift", - "kubernetes", - "redhat", - "clusters", + "OpenShift", + "Kubernetes", + "Red Hat", + "Clusters", "k8s", - "redhat", - "crc", - "codereadycontainers" + "CRC", + "CodeReady Containers", + "devsandbox", + "debuggers", + "Cloud" ], "icon": "images/openshift_extension.png", "main": "./out/src/extension", @@ -1564,7 +1567,7 @@ "Title": "CRC Pull Secret Path", "type": "string", "default": null, - "description": "Provide the path where the pull secret file is present." + "description": "Path of image pull secret." }, "openshiftConnector.crcCpuCores": { "Title": "CRC Cpu Cores", diff --git a/src/webview/cluster/app/clusterView.tsx b/src/webview/cluster/app/clusterView.tsx index 6b5011267..5d9f2f350 100644 --- a/src/webview/cluster/app/clusterView.tsx +++ b/src/webview/cluster/app/clusterView.tsx @@ -269,8 +269,8 @@ export default function addClusterView(props) { const fetchDownloadBinary = () => { const platform = (window as any).platform; let crcBundle = ''; - if (platform === 'darwin') crcBundle = 'crc-macos-amd64.tar.xz'; - if (platform === 'win32') crcBundle = 'crc-windows-amd64.zip'; + if (platform === 'darwin') crcBundle = 'crc-macos-amd64.pkg'; + if (platform === 'win32') crcBundle = 'crc-windows-installer.zip'; if (platform === 'linux') crcBundle = 'crc-linux-amd64.tar.xz'; return `${crcDefaults.DefaultCrcUrlBase}/${crcLatest}/${crcBundle}`; }