seg_yinzy
/
che-operator
mirror of https://github.com/eclipse-che/che-operator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix suggestions 

Signed-off-by: Flavius Lacatusu <flacatus@redhat.com>
pull/890/head
Flavius Lacatusu 2021-07-28 14:19:28 +02:00
parent f8e05779f8
commit 1624742e3f
No known key found for this signature in database
GPG Key ID: 1F5C00691820AC13
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README.md
View File

@ -140,19 +140,19 @@ $ chectl server:deploy --installer=olm --platform=<CHECTL_SUPPORTED_PLATFORM> --
### Deploy stable Che operator in Cluster Wide Availability ### 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). 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: 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. * 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. 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. * 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). * 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 ```bash
chectl server:deploy --installer=olm --platform=openshift --olm-channel=stable-all-namespaces chectl server:deploy --installer=olm --platform=openshift --olm-channel=stable-all-namespaces

2
bundle/stable-all-namespaces/eclipse-che-preview-openshift/metadata/dependencies.yaml
View File

@ -2,4 +2,4 @@ dependencies:
- type: olm.package - type: olm.package
value: value:
packageName: devworkspace-operator packageName: devworkspace-operator
version: ">=0.6.0" version: ">=0.8.0"

16
pkg/deploy/dev-workspace/dev_workspace.go
View File

@ -39,12 +39,12 @@ import (
) )
var ( var (
DevWorkspaceNamespace = "devworkspace-controller" DevWorkspaceNamespace = "devworkspace-controller"
DevWorkspaceCheNamespace = "devworkspace-che" DevWorkspaceWebhookName = "controller.devfile.io"
DevWorkspaceWebhookName = "controller.devfile.io" DevWorkspaceServiceAccount = "devworkspace-controller-serviceaccount"
DevWorkspaceServiceAccount = "devworkspace-controller-serviceaccount" DevWorkspaceService = "devworkspace-controller-manager-service"
DevWorkspaceService = "devworkspace-controller-manager-service" DevWorkspaceDeploymentName = "devworkspace-controller-manager"
DevWorkspaceDeploymentName = "devworkspace-controller-manager"
SubscriptionResourceName = "subscriptions" SubscriptionResourceName = "subscriptions"
CheManagerResourcename = "chemanagers" CheManagerResourcename = "chemanagers"
ClusterServiceVersionResourceName = "clusterserviceversions" ClusterServiceVersionResourceName = "clusterserviceversions"
@ -117,7 +117,7 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) {
} }
// Check if exists devworkspace operator csv is already installed // Check if exists devworkspace operator csv is already installed
devWorkspaceOperatorCSVExists := isDevWorkspaceControllerCSVExists(deployContext) devWorkspaceOperatorCSVExists := isDevWorkspaceOperatorCSVExists(deployContext)
if devWorkspaceOperatorCSVExists { if devWorkspaceOperatorCSVExists {
return true, nil return true, nil
} }
@ -161,7 +161,7 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) {
return true, nil 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 clusterserviceversions resource doesn't exist in cluster DWO as well will not be present
if !util.HasK8SResourceObject(deployContext.ClusterAPI.DiscoveryClient, ClusterServiceVersionResourceName) { if !util.HasK8SResourceObject(deployContext.ClusterAPI.DiscoveryClient, ClusterServiceVersionResourceName) {
return false return false