feat: secure workspace services (#1045)

Signed-off-by: Michal Vala <mvala@redhat.com>
eclipse-che · Sep 17, 2021 · 2ad6c4f · 2ad6c4f
1 parent 351af9a
commit 2ad6c4f
Show file tree

Hide file tree

Showing 10 changed files with 522 additions and 262 deletions.
diff --git a/api/conversion.go b/api/conversion.go
@@ -3,6 +3,7 @@ package org
 import (
 	v1 "github.com/eclipse-che/che-operator/api/v1"
 	"github.com/eclipse-che/che-operator/api/v2alpha1"
+	"github.com/eclipse-che/che-operator/pkg/deploy"
 	"github.com/eclipse-che/che-operator/pkg/util"
 	"sigs.k8s.io/yaml"
 )
@@ -145,7 +146,7 @@ func v1ToV2alpha1_GatewayEnabled(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {
 }
 
 func v1ToV2alpha1_GatewayImage(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {
-	v2.Spec.Gateway.Image = v1.Spec.Server.SingleHostGatewayImage
+	v2.Spec.Gateway.Image = util.GetValue(v1.Spec.Server.SingleHostGatewayImage, deploy.DefaultSingleHostGatewayImage(v1))
 }
 
 func v1ToV2alpha1_GatewayConfigurerImage(v1 *v1.CheCluster, v2 *v2alpha1.CheCluster) {

diff --git a/controllers/devworkspace/defaults/defaults.go b/controllers/devworkspace/defaults/defaults.go
@@ -43,8 +43,8 @@ var (
 	}
 )
 
-func GetGatewayWorkpaceConfigMapName(workspaceID string) string {
-	return workspaceID
+func GetGatewayWorkspaceConfigMapName(workspaceID string) string {
+	return workspaceID + "-route"
 }
 
 func GetLabelsForComponent(cluster *v2alpha1.CheCluster, component string) map[string]string {