removed istag from db; added istag to app; fixed patches

.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:

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:

overlays/devel/image-trigger-tags.yaml

@@ -1,3 +1,6 @@
-- op: replace
-  path: /metadata/annotations/image.openshift.io\/triggers
-  value: '[{"from":{"kind":"ImageStreamTag","name":"quotes:devel"},"fieldPath":"spec.template.spec.containers[?(@.name==\"quotes\")].image"}]'
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: quotes
+  annotations:
+    image.openshift.io/triggers: '[{"from":{"kind":"ImageStreamTag","name":"quotes:devel"},"fieldPath":"spec.template.spec.containers[?(@.name==\"quotes\")].image"}]'

overlays/devel/istag-devel-merge.yaml

@@ -0,0 +1,7 @@
+apiVersion: image.openshift.io/v1
+kind: ImageStream
+metadata:
+  name: quotes
+spec:
+  tags:
+    - name: devel

overlays/devel/kustomization.yml

@@ -7,14 +7,7 @@ configMapGenerator:
     behavior: merge
     literals:
       - aio="1"
-patchesJson6902:
-  - target:
-      version: build.openshift.io/v1
-      kind: BuildConfig
-      name: quotes
-    path: output-image-tag.yaml
-  - target:
-      version: apps/v1
-      kind: Deployment
-      name: quotes
-    path: image-trigger-tags.yaml
+patchesStrategicMerge:
+  - istag-devel-merge.yaml
+  - output-image-tag.yaml
+  - image-trigger-tags.yaml

overlays/devel/output-image-tag.yaml

@@ -1,3 +1,8 @@
-- op: replace
-  path: /spec/output/to/name
-  value: quotes:devel
+apiVersion: build.openshift.io/v1
+kind: BuildConfig
+metadata:
+  name: quotes
+spec:
+  output:
+    to:
+      name: quotes:devel