caught up with other branches

.gitignore

@@ -0,0 +1 @@
+.*.swp

base/app-resources.yml

@@ -14,6 +14,8 @@ items:
   spec:
     lookupPolicy:
       local: false
+    tags:
+      - name: latest
 - apiVersion: build.openshift.io/v1
   kind: BuildConfig
   metadata:
@@ -81,17 +83,20 @@ items:
           name: quotes
           env:
             - name: DATABASE_NAME
-              configMapKeyRef:
-                name: dbconfig
-                key: database
+              valueFrom:
+                configMapKeyRef:
+                  name: dbconfig
+                  key: database
             - name: DATABASE_USER
-              configMapKeyRef:
-                name: dbconfig
-                key: username
+              valueFrom:
+                configMapKeyRef:
+                  name: dbconfig
+                  key: username
             - name: DATABASE_PASSWORD
-              secretKeyRef:
-                name: dbauth
-                key: password
+              valueFrom:
+                secretKeyRef:
+                  name: dbauth
+                  key: password
             - name: DATABASE_SERVICE_NAME
               value: quotesdb
           ports:

base/db-resources.yml

@@ -2,35 +2,6 @@ apiVersion: v1
 kind: List
 metadata: {}
 items:
-- apiVersion: image.openshift.io/v1
-  kind: ImageStreamTag
-  metadata:
-    labels:
-      app: quotesdb
-      app.kubernetes.io/component: quotesdb
-      app.kubernetes.io/instance: quotesdb
-      app.kubernetes.io/name: mariadb
-      composition: quotes
-    name: quotesdb:10.3-el8
-  generation: 0
-  image:
-    dockerImageLayers: null
-    dockerImageMetadata: null
-    metadata:
-      creationTimestamp: null
-  lookupPolicy:
-    local: false
-  tag:
-    annotations: null
-    from:
-      kind: DockerImage
-      name: registry.redhat.io/rhel8/mariadb-103@sha256:89b8a68cb817f381aff9f0595e8b56e8541ee860cf7e23c0d97286164ffea9e7
-    generation: null
-    importPolicy:
-      scheduled: true
-    name: 10.3-el8
-    referencePolicy:
-      type: ""
 - apiVersion: apps/v1
   kind: Deployment
   metadata:
@@ -61,21 +32,25 @@ items:
           name: quotesdb
           env:
             - name: MYSQL_DATABASE
-              configMapKeyRef:
-                name: dbconfig
-                key: database
+              valueFrom:
+                configMapKeyRef:
+                  name: dbconfig
+                  key: database
             - name: MYSQL_USER
-              configMapKeyRef:
-                name: dbconfig
-                key: username
+              valueFrom:
+                configMapKeyRef:
+                  name: dbconfig
+                  key: username
             - name: MYSQL_PASSWORD
-              secretKeyRef:
-                name: dbauth
-                key: password
+              valueFrom:
+                secretKeyRef:
+                  name: dbauth
+                  key: password
             - name: MYSQL_AIO
-              configMapKeyRef:
-                name: dbconfig
-                key: aio
+              valueFrom:
+                configMapKeyRef:
+                  name: dbconfig
+                  key: aio
           ports:
           - containerPort: 3306
             protocol: TCP