From 8a1abd1d259ead5b54b0d49e1ff596a1d6f3a661 Mon Sep 17 00:00:00 2001 From: Anatolii Bazko Date: Mon, 24 May 2021 12:23:18 +0300 Subject: [PATCH] Fixes Signed-off-by: Anatolii Bazko --- deploy/cluster_role.yaml | 9 +++++++++ .../manifests/che-operator.clusterserviceversion.yaml | 9 +++++++++ .../manifests/che-operator.clusterserviceversion.yaml | 9 +++++++++ pkg/deploy/dev-workspace/dev_workspace.go | 4 +--- 4 files changed, 28 insertions(+), 3 deletions(-) diff --git a/deploy/cluster_role.yaml b/deploy/cluster_role.yaml index 8df10e166..4dbe8e814 100644 --- a/deploy/cluster_role.yaml +++ b/deploy/cluster_role.yaml @@ -282,6 +282,15 @@ rules: - subscriptions verbs: - get + - apiGroups: + - metrics.k8s.io + resources: + - pods + - nodes + verbs: + - get + - list + - watch ### CHE-OPERATOR ROLES ONLY: END # devworkspace-controller-view-workspaces.ClusterRole.yaml - apiGroups: diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml index 261942f9c..d2dc6d288 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-kubernetes/manifests/che-operator.clusterserviceversion.yaml @@ -446,6 +446,15 @@ spec: - subscriptions verbs: - get + - apiGroups: + - metrics.k8s.io + resources: + - pods + - nodes + verbs: + - get + - list + - watch - apiGroups: - workspace.devfile.io resources: diff --git a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml index 8ae9b19cb..6a57b27b1 100644 --- a/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml +++ b/deploy/olm-catalog/nightly/eclipse-che-preview-openshift/manifests/che-operator.clusterserviceversion.yaml @@ -515,6 +515,15 @@ spec: - subscriptions verbs: - get + - apiGroups: + - metrics.k8s.io + resources: + - pods + - nodes + verbs: + - get + - list + - watch - apiGroups: - workspace.devfile.io resources: diff --git a/pkg/deploy/dev-workspace/dev_workspace.go b/pkg/deploy/dev-workspace/dev_workspace.go index aa642d553..32a75400a 100644 --- a/pkg/deploy/dev-workspace/dev_workspace.go +++ b/pkg/deploy/dev-workspace/dev_workspace.go @@ -143,9 +143,7 @@ func ReconcileDevWorkspace(deployContext *deploy.DeployContext) (bool, error) { return true, nil } } else if util.GetServerExposureStrategy(deployContext.CheCluster) == "single-host" { - logrus.Warn(`DevWorkspace Che operator can't be enabled in 'single-host mode on Kubernetes cluster'. -See https://github.com/eclipse/che/issues/19714 for more details. -To enable DevWorkspace Che operator set 'spec.server.serverExposureStrategy' to 'multi-host'.`) + logrus.Warn(`DevWorkspace Che operator can't be enabled in 'single-host mode on Kubernetes cluster'. See https://github.com/eclipse/che/issues/19714 for more details. To enable DevWorkspace Che operator set 'spec.server.serverExposureStrategy' to 'multi-host'.`) return true, nil }