Merge pull request #52 from integr8ly/INTLY-1993

Intly 1993
integr8ly · Jun 4, 2019 · 5abdc24 · 5abdc24
2 parents 7faa7a4 + d7018a5
commit 5abdc24
Show file tree

Hide file tree

Showing 5 changed files with 98 additions and 73 deletions.
diff --git a/Gopkg.lock b/Gopkg.lock
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.18
+TAG=0.0.19
 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.18
+          image: quay.io/integreatly/tutorial-web-app-operator:v0.0.19
           ports:
           - containerPort: 60000
             name: metrics

diff --git a/deploy/template/tutorial-web-app.yml b/deploy/template/tutorial-web-app.yml
@@ -31,75 +31,98 @@ parameters:
     description: A comma separated list of git repositories or paths to walkthrough directories
     value: https://github.com/integr8ly/tutorial-web-app-walkthroughs.git#v1.6.4
     required: true
+  - name: DATABASE_LOCATION
+    description: The location of the user walkthroughs database in the filesystem
+    value: /opt/user-walkthroughs
+    required: true
 objects:
-- apiVersion: v1
-  kind: DeploymentConfig
-  metadata:
-    labels:
-      app: tutorial-web-app
-    name: tutorial-web-app
-  spec:
-    replicas: 1
-    revisionHistoryLimit: 2
-    selector:
-      app: tutorial-web-app
-    strategy:
-      rollingParams:
-        timeoutSeconds: 3600
-      type: Rolling
-    template:
-      metadata:
-        labels:
-          app: tutorial-web-app
-      spec:
-        containers:
-        - env:
-          - name: KUBERNETES_NAMESPACE
-            valueFrom:
-              fieldRef:
-                fieldPath: metadata.namespace
-          - name: OPENSHIFT_OAUTHCLIENT_ID
-            value: ${OPENSHIFT_OAUTHCLIENT_ID}
-          - name: OPENSHIFT_HOST
-            value: ${OPENSHIFT_HOST}
-          - name: NODE_ENV
-            value: production
-          - name: SSO_ROUTE
-            value: ${SSO_ROUTE}
-          - name: WALKTHROUGH_LOCATIONS
-            value: ${WALKTHROUGH_LOCATIONS}
-          - name: INTEGREATLY_VERSION
-            value: ${INTEGREATLY_VERSION}
-          image: quay.io/integreatly/tutorial-web-app:2.10.3
-          imagePullPolicy: Always
-          name: tutorial-web-app
-          ports:
-          - containerPort: 5001
-            name: http
-            protocol: TCP
-    triggers:
-      - type: ConfigChange
-- apiVersion: v1
-  kind: Service
-  metadata:
-    labels:
-      app: tutorial-web-app
-    name: tutorial-web-app
-  spec:
-    ports:
-    - name: http
-      port: 5001
-    selector:
-      app: tutorial-web-app
-- apiVersion: v1
-  kind: Route
-  metadata:
-    labels:
-      app: tutorial-web-app
-    name: tutorial-web-app
-  spec:
-    tls:
-      termination: edge
-    to:
-      kind: Service
+  - apiVersion: v1
+    kind: DeploymentConfig
+    metadata:
+      labels:
+        app: tutorial-web-app
+      name: tutorial-web-app
+    spec:
+      replicas: 1
+      revisionHistoryLimit: 2
+      selector:
+        app: tutorial-web-app
+      strategy:
+        rollingParams:
+          timeoutSeconds: 3600
+        type: Rolling
+      template:
+        metadata:
+          labels:
+            app: tutorial-web-app
+        spec:
+          volumes:
+            - name: user-walkthroughs
+              persistentVolumeClaim:
+                claimName: user-walkthroughs
+          containers:
+            - env:
+                - name: KUBERNETES_NAMESPACE
+                  valueFrom:
+                    fieldRef:
+                      fieldPath: metadata.namespace
+                - name: OPENSHIFT_OAUTHCLIENT_ID
+                  value: ${OPENSHIFT_OAUTHCLIENT_ID}
+                - name: OPENSHIFT_HOST
+                  value: ${OPENSHIFT_HOST}
+                - name: NODE_ENV
+                  value: production
+                - name: SSO_ROUTE
+                  value: ${SSO_ROUTE}
+                - name: WALKTHROUGH_LOCATIONS
+                  value: ${WALKTHROUGH_LOCATIONS}
+                - name: INTEGREATLY_VERSION
+                  value: ${INTEGREATLY_VERSION}
+                - name: DATABASE_LOCATION
+                  value: ${DATABASE_LOCATION}
+              image: quay.io/integreatly/tutorial-web-app:2.10.4
+              imagePullPolicy: Always
+              name: tutorial-web-app
+              ports:
+                - containerPort: 5001
+                  name: http
+                  protocol: TCP
+              volumeMounts:
+                - mountPath: ${DATABASE_LOCATION}
+                  name: user-walkthroughs
+      triggers:
+        - type: ConfigChange
+  - apiVersion: v1
+    kind: Service
+    metadata:
+      labels:
+        app: tutorial-web-app
+      name: tutorial-web-app
+    spec:
+      ports:
+        - name: http
+          port: 5001
+      selector:
+        app: tutorial-web-app
+  - apiVersion: v1
+    kind: Route
+    metadata:
+      labels:
+        app: tutorial-web-app
       name: tutorial-web-app
+    spec:
+      tls:
+        termination: edge
+      to:
+        kind: Service
+        name: tutorial-web-app
+  - apiVersion: v1
+    kind: PersistentVolumeClaim
+    metadata:
+      name: user-walkthroughs
+    spec:
+      accessModes:
+        - "ReadWriteOnce"
+      resources:
+        requests:
+          storage: "100Mi"
diff --git a/version/version.go b/version/version.go
@@ -1,5 +1,5 @@
 package version
 
 var (
-	Version = "0.0.18"
+	Version = "0.0.19"
 )