From 14481b706679d00a4c6701d3628075cd79b62ae7 Mon Sep 17 00:00:00 2001 From: dimitraz Date: Wed, 6 May 2020 12:23:04 +0100 Subject: [PATCH 1/2] update route name for 2.x --- pkg/handlers/webhandler.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go index 9c07bcb..b928d02 100644 --- 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 } From e328b8ae4802f6d7c5516b1e12714698bd228b09 Mon Sep 17 00:00:00 2001 From: dimitraz Date: Wed, 6 May 2020 12:38:37 +0100 Subject: [PATCH 2/2] version bump --- Makefile | 2 +- deploy/operator.yaml | 2 +- version/version.go | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index e892b6a..e5bfc8e 100644 --- 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 index d451433..22eb464 100644 --- 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/version/version.go b/version/version.go index 59e88cf..ba2dd81 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "0.0.52" + Version = "0.0.53" )