Merge pull request #95 from dimitraz/update-route

Update route name for 2.x
integr8ly · May 6, 2020 · 802eab2 · 802eab2
2 parents 5dd810e + e328b8a
commit 802eab2
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ SHELL=/bin/bash
 REG=quay.io
 ORG=integreatly
 IMAGE=tutorial-web-app-operator
-TAG=v0.0.52
+TAG=v0.0.53
 KUBE_CMD=oc apply -f
 DEPLOY_DIR=deploy
 OUT_STATIC_DIR=tmp/_output

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -15,7 +15,7 @@ spec:
       serviceAccountName: tutorial-web-app-operator
       containers:
         - name: tutorial-web-app-operator
-          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.52
+          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.53
           ports:
             - containerPort: 60000
               name: metrics

diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go
@@ -173,6 +173,7 @@ func deleteEnvVar(container corev1.Container, envName string) (bool, corev1.Cont
 	}
 	return false, container
 }
+
 func updateOrCreateEnvVar(container corev1.Container, envName, envVal string) (bool, corev1.Container) {
 	for envIndex, envVar := range container.Env {
 		if envVar.Name == envName {
@@ -257,7 +258,9 @@ func (h *AppHandler) CreateRoute(cr *v1alpha1.WebApp) *routev1.Route {
 	// make sure to not change the existing route hosts because the cluster CORS settings
 	// depend on it
 	if subdomain != "" {
-		route.Spec.Host = fmt.Sprintf("solution-explorer.%s", subdomain)
+		routeName := "solution-explorer"
+		route.Name = routeName
+		route.Spec.Host = fmt.Sprintf("%s.%s", routeName, subdomain)
 	}
 	return route
 }

diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.52"
+	Version = "0.0.53"
 )