diff --git a/README.md b/README.md index 8ab2cf41d..14aaa4749 100644 --- a/README.md +++ b/README.md @@ -140,19 +140,19 @@ $ chectl server:deploy --installer=olm --platform= -- ### Deploy stable Che operator in Cluster Wide Availability -Eclipse Che introduce a new channel which install Eclipse Che in AllNamespace mode with Devworkspace Operator like a OLM dependency. +Eclipse Che introduced a new channel which installs Eclipse Che in AllNamespace mode with Devworkspace Operator like an OLM dependency. More info about DevWorkspace Operator can be found [here](https://github.com/devfile/devworkspace-operator). Before installing Eclipse Che using channel `stable-all-namespaces` we need to consider the following: * It is not possible to have Eclipse Che installed in single Namespace (currently the default one) and then try to install Che in All Namespace mode using the new channel stable-all-namespaces. -* To update to stable-all-namespaces channel you need first to remove all subscriptions created for che installed from nightly or stable +* To update to stable-all-namespaces channel you need first to remove all subscriptions created for Che installed from nightly or stable channels. IMPORTANT: Removing subscriptions doesn’t mean Eclipse Che operands(che-server, keycloak or roles) will be removed from the cluster. * DevWorkspace engine will be by default enabled in the new channel. * In case if you have already installed Che with DevWorkspace engine enabled from channels nightly or stable you need to remove all DevWorkspace resources from the cluster following the next [scripts](https://github.com/devfile/devworkspace-operator/blob/main/build/make/deploy.mk#L77). -* `stable-all-namespaces` channel is supported only in openshift. +* `stable-all-namespaces` channel is supported only in OpenShift. -If the Openshift Cluster already have all these considerations done you can proceed to install the Eclipse Che using stable-all-namespaces channel from OperatorHub or using the new channel you need to perform next chectl command: +If the OpenShift Cluster already have all these considerations done you can proceed to install the Eclipse Che using stable-all-namespaces channel from OperatorHub or using the new channel you need to perform the following chectl command: ```bash chectl server:deploy --installer=olm --platform=openshift --olm-channel=stable-all-namespaces diff --git a/bundle/stable-all-namespaces/eclipse-che-preview-openshift/metadata/dependencies.yaml b/bundle/stable-all-namespaces/eclipse-che-preview-openshift/metadata/dependencies.yaml index 12f75b34d..a195e3716 100644 --- a/bundle/stable-all-namespaces/eclipse-che-preview-openshift/metadata/dependencies.yaml +++ b/bundle/stable-all-namespaces/eclipse-che-preview-openshift/metadata/dependencies.yaml @@ -2,4 +2,4 @@ dependencies: - type: olm.package value: packageName: devworkspace-operator - version: ">=0.6.0" + version: ">=0.8.0" diff --git a/pkg/deploy/dev-workspace/dev_workspace.go b/pkg/deploy/dev-workspace/dev_workspace.go index 1126cde6b..03f0819a8 100644 --- a/pkg/deploy/dev-workspace/dev_workspace.go +++ b/pkg/deploy/dev-workspace/dev_workspace.go @@ -39,12 +39,12 @@ import ( ) var ( - DevWorkspaceNamespace = "devworkspace-controller" - DevWorkspaceCheNamespace = "devworkspace-che" - DevWorkspaceWebhookName = "controller.devfile.io" - DevWorkspaceServiceAccount = "devworkspace-controller-serviceaccount" - DevWorkspaceService = "devworkspace-controller-manager-service" - DevWorkspaceDeploymentName = "devworkspace-controller-manager" + DevWorkspaceNamespace = "devworkspace-controller" + DevWorkspaceWebhookName = "controller.devfile.io" + DevWorkspaceServiceAccount = "devworkspace-controller-serviceaccount" + DevWorkspaceService = "devworkspace-controller-manager-service" + DevWorkspaceDeploymentName = "devworkspace-controller-manager" + SubscriptionResourceName = "subscriptions" CheManagerResourcename = "chemanagers" ClusterServiceVersionResourceName = "clusterserviceversions" @@ -117,7 +117,7 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) { } // Check if exists devworkspace operator csv is already installed - devWorkspaceOperatorCSVExists := isDevWorkspaceControllerCSVExists(deployContext) + devWorkspaceOperatorCSVExists := isDevWorkspaceOperatorCSVExists(deployContext) if devWorkspaceOperatorCSVExists { return true, nil } @@ -161,7 +161,7 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) { return true, nil } -func isDevWorkspaceControllerCSVExists(deployContext *deploy.DeployContext) bool { +func isDevWorkspaceOperatorCSVExists(deployContext *deploy.DeployContext) bool { // If clusterserviceversions resource doesn't exist in cluster DWO as well will not be present if !util.HasK8SResourceObject(deployContext.ClusterAPI.DiscoveryClient, ClusterServiceVersionResourceName) { return false