Merge pull request #88 from integr8ly/update-webapp-2.22.3

Update webapp 2.22.3
integr8ly · Apr 9, 2020 · ff95b81 · ff95b81
2 parents 38b04c9 + 8b9d682
commit ff95b81
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 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=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
@@ -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/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:
@@ -138,7 +138,7 @@ objects:
     metadata:
       labels:
         app: tutorial-web-app
-      name: tutorial-web-app
+      name: solution-explorer
     spec:
       tls:
         termination: edge

diff --git a/pkg/handlers/webhandler.go b/pkg/handlers/webhandler.go
@@ -26,15 +26,16 @@ 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"
 	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}
+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{

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