From 8bcd2b969c66af311129c6dadc817c179e984b89 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Thu, 9 Apr 2020 13:43:07 +0200 Subject: [PATCH 1/4] update route name --- deploy/template/tutorial-web-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deploy/template/tutorial-web-app.yml b/deploy/template/tutorial-web-app.yml index 055a098..82d9110 100644 --- a/deploy/template/tutorial-web-app.yml +++ b/deploy/template/tutorial-web-app.yml @@ -138,7 +138,7 @@ objects: metadata: labels: app: tutorial-web-app - name: tutorial-web-app + name: solution-explorer spec: tls: termination: edge From 3d1908265d535ca51da3f7e9f71129aed2a76b17 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Thu, 9 Apr 2020 13:44:30 +0200 Subject: [PATCH 2/4] update webapp to 2.22.3 --- deploy/template/tutorial-web-app.yml | 2 +- pkg/handlers/webhandler.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deploy/template/tutorial-web-app.yml b/deploy/template/tutorial-web-app.yml index 82d9110..2b4236f 100644 --- a/deploy/template/tutorial-web-app.yml +++ b/deploy/template/tutorial-web-app.yml @@ -109,7 +109,7 @@ objects: value: ${DATABASE_LOCATION} - name: INSTALLED_SERVICES value: ${INSTALLED_SERVICES} - image: quay.io/integreatly/tutorial-web-app:2.22.1 + image: quay.io/integreatly/tutorial-web-app:2.22.3 imagePullPolicy: Always name: tutorial-web-app ports: diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go index 872cf93..e3702a8 100644 --- a/pkg/handlers/webhandler.go +++ b/pkg/handlers/webhandler.go @@ -31,7 +31,7 @@ const ( ClusterTypeDefault = "not set" OpenShiftVersionDefault = "3" OpenShiftAPIHostDefault = "openshift.default.svc" - WebAppImage = "quay.io/integreatly/tutorial-web-app:2.22.1" + WebAppImage = "quay.io/integreatly/tutorial-web-app:2.22.3" ) var webappParams = [...]string{"OPENSHIFT_OAUTHCLIENT_ID", "OPENSHIFT_HOST", "OPENSHIFT_OAUTH_HOST", "SSO_ROUTE", OpenShiftAPIHost, OpenShiftVersion, IntegreatlyVersion, WTLocations, ClusterType} From 0417dd403af3dff049facf60e5c0d2d161099335 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Thu, 9 Apr 2020 13:44:58 +0200 Subject: [PATCH 3/4] 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 b895201..d307109 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ SHELL=/bin/bash REG=quay.io ORG=integreatly IMAGE=tutorial-web-app-operator -TAG=0.0.46 +TAG=0.0.47 KUBE_CMD=oc apply -f DEPLOY_DIR=deploy OUT_STATIC_DIR=tmp/_output diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 34296c1..8db009f 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.46 + image: quay.io/integreatly/tutorial-web-app-operator:v0.0.47 ports: - containerPort: 60000 name: metrics diff --git a/version/version.go b/version/version.go index 219639e..375738d 100644 --- a/version/version.go +++ b/version/version.go @@ -1,5 +1,5 @@ package version var ( - Version = "0.0.46" + Version = "0.0.47" ) From 8b9d68273b70fd588e158272c9258847fdd59c63 Mon Sep 17 00:00:00 2001 From: Peter Braun Date: Thu, 9 Apr 2020 16:48:22 +0200 Subject: [PATCH 4/4] add installed services to the list of allowed params --- pkg/handlers/webhandler.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go index e3702a8..9c34595 100644 --- a/pkg/handlers/webhandler.go +++ b/pkg/handlers/webhandler.go @@ -26,6 +26,7 @@ const ( ClusterType = "CLUSTER_TYPE" OpenShiftVersion = "OPENSHIFT_VERSION" OpenShiftAPIHost = "OPENSHIFT_API" + InstalledServices = "INSTALLED_SERVICES" WTLocationsDefault = "https://github.com/integr8ly/tutorial-web-app-walkthroughs#v1.10.1" IntegreatlyVersionDefault = "not set" ClusterTypeDefault = "not set" @@ -34,7 +35,7 @@ const ( WebAppImage = "quay.io/integreatly/tutorial-web-app:2.22.3" ) -var webappParams = [...]string{"OPENSHIFT_OAUTHCLIENT_ID", "OPENSHIFT_HOST", "OPENSHIFT_OAUTH_HOST", "SSO_ROUTE", OpenShiftAPIHost, OpenShiftVersion, IntegreatlyVersion, WTLocations, ClusterType} +var webappParams = [...]string{"OPENSHIFT_OAUTHCLIENT_ID", "OPENSHIFT_HOST", "OPENSHIFT_OAUTH_HOST", "SSO_ROUTE", OpenShiftAPIHost, OpenShiftVersion, IntegreatlyVersion, WTLocations, ClusterType, InstalledServices} func NewWebHandler(m *metrics.Metrics, osClient openshift.OSClientInterface, factory ClientFactory, cruder SdkCruder) AppHandler { return AppHandler{