Merge pull request #70 from JameelB/INTLY-3286

INTLY-3286: Handle reconcile of installed_service env var
integr8ly · Oct 14, 2019 · 8381844 · 8381844
2 parents be12852 + fa2cf43
commit 8381844
Show file tree

Hide file tree

Showing 4 changed files with 9 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=0.0.30
+TAG=0.0.31
 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.30
+          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.31
           ports:
           - containerPort: 60000
             name: metrics

diff --git a/deploy/template/tutorial-web-app.yml b/deploy/template/tutorial-web-app.yml
@@ -49,6 +49,9 @@ parameters:
     description: The location of the user walkthroughs database in the filesystem
     value: /opt/user-walkthroughs
     required: true
+  - name: INSTALLED_SERVICES
+    description: Object which contains information on the services installed by Integreatly. Only used for OpenShift V4
+    required: false
 objects:
   - apiVersion: v1
     kind: DeploymentConfig
@@ -104,7 +107,9 @@ objects:
                   value: ${CLUSTER_TYPE}
                 - name: DATABASE_LOCATION
                   value: ${DATABASE_LOCATION}
-              image: quay.io/integreatly/tutorial-web-app:2.18.7
+                - name: INSTALLED_SERVICES
+                  value: ${INSTALLED_SERVICES}
+              image: quay.io/integreatly/tutorial-web-app:2.18.9
               imagePullPolicy: Always
               name: tutorial-web-app
               ports:

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