From 78e5dbaa0caf22d1656691e9e19e2b47b78a8ca9 Mon Sep 17 00:00:00 2001 From: Sergii Leshchenko Date: Mon, 12 Jul 2021 15:24:49 +0300 Subject: [PATCH] fix: make che operator take into account DWO Service --- pkg/deploy/dev-workspace/dev_workspace.go | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkg/deploy/dev-workspace/dev_workspace.go b/pkg/deploy/dev-workspace/dev_workspace.go index f1791414c..5c69b874e 100644 --- a/pkg/deploy/dev-workspace/dev_workspace.go +++ b/pkg/deploy/dev-workspace/dev_workspace.go @@ -41,6 +41,7 @@ var ( DevWorkspaceCheNamespace = "devworkspace-che" DevWorkspaceWebhookName = "controller.devfile.io" DevWorkspaceServiceAccount = "devworkspace-controller-serviceaccount" + DevWorkspaceService = "devworkspace-controller-manager-service" DevWorkspaceDeploymentName = "devworkspace-controller-manager" SubscriptionResourceName = "subscriptions" CheManagerResourcename = "chemanagers" @@ -66,6 +67,7 @@ var ( DevWorkspaceTemplatesCRDFile = DevWorkspaceTemplates + "/devworkspacetemplates.workspace.devfile.io.CustomResourceDefinition.yaml" DevWorkspaceCRDFile = DevWorkspaceTemplates + "/devworkspaces.workspace.devfile.io.CustomResourceDefinition.yaml" DevWorkspaceConfigMapFile = DevWorkspaceTemplates + "/devworkspace-controller-configmap.ConfigMap.yaml" + DevWorkspaceServiceFile = DevWorkspaceTemplates + "/devworkspace-controller-manager-service.Service.yaml" DevWorkspaceDeploymentFile = DevWorkspaceTemplates + "/devworkspace-controller-manager.Deployment.yaml" WebTerminalOperatorSubscriptionName = "web-terminal" @@ -82,6 +84,7 @@ var ( cachedObj = make(map[string]*Object2Sync) syncItems = []func(*deploy.DeployContext) (bool, error){ createDwNamespace, + syncDwService, syncDwServiceAccount, syncDwClusterRole, syncDwProxyClusterRole, @@ -187,6 +190,10 @@ func syncDwServiceAccount(deployContext *deploy.DeployContext) (bool, error) { return readAndSyncObject(deployContext, DevWorkspaceServiceAccountFile, &corev1.ServiceAccount{}, DevWorkspaceNamespace) } +func syncDwService(deployContext *deploy.DeployContext) (bool, error) { + return readAndSyncObject(deployContext, DevWorkspaceServiceFile, &corev1.Service{}, DevWorkspaceNamespace) +} + func syncDwRole(deployContext *deploy.DeployContext) (bool, error) { return readAndSyncObject(deployContext, DevWorkspaceRoleFile, &rbacv1.Role{}, DevWorkspaceNamespace) }