Merge pull request validatedpatterns#18 from mhjacks/main

Bringing the infrastructure up to date and passing tests again

Changes.md

@@ -3,3 +3,11 @@
 ## December 13, 2022
 
 * Initial release.
+
+## January 8, 2023
+
+* Updates to various componenets to bring them in line with other Validated Patterns
+* Remove PipelineResources from pipelines
+* Remove MajesticMonolith from applications that are built and deployed - it was not being used in any case
+* Update applications to use latest UBI-8 instead of old 8.1/8.3 versions
+* Update common

charts/all/quarkuscoffeeshop-kafka/templates/amq-kafka-instance.yaml

@@ -7,7 +7,7 @@ spec:
     topicOperator: {}
     userOperator: {}
   kafka:
-    version: 3.1.0
+    version: 3.6.0
     replicas: 3
     listeners:
       - name: plain
@@ -24,7 +24,7 @@ spec:
         tls: true
     config:
       default.replication.factor: 3
-      inter.broker.protocol.version: '3.1'
+      inter.broker.protocol.version: '3.6'
       min.insync.replicas: 2
       offsets.topic.replication.factor: 3
       transaction.state.log.min.isr: 2

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-barista-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-barista
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-barista-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-barista-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-counter-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-counter
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-counter-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-counter-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-customerloyalty-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-customerloyalty
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-customerloyalty-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-customerloyalty-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-customermocker-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-customermocker
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-customermocker-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-customermocker-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-inventory-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-inventory
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-inventory-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-inventory-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-kitchen-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-kitchen
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-kitchen-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-kitchen-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/extra/quarkuscoffeeshop-web-plr.yaml

@@ -11,13 +11,6 @@ metadata:
 spec:
   pipelineRef:
     name: build-and-push-quarkuscoffeeshop-web
-  resources:
-    - name: app-git
-      resourceRef:
-        name: quarkuscoffeeshop-web-git
-    - name: image
-      resourceRef:
-        name: quarkuscoffeeshop-web-image
   serviceAccountName: pipeline
   timeout: 1h0m0s
   workspaces:

charts/hub/quarkuscoffeeshop-pipelines/templates/quay-auth-secret.yaml

@@ -6,8 +6,8 @@ metadata:
 spec:
   refreshInterval: 15s
   secretStoreRef:
-    name: {{ .Values.secretStore.name }}
-    kind: {{ .Values.secretStore.kind }}
+    name: {{ .Values.global.secretStore.name }}
+    kind: {{ .Values.global.secretStore.kind }}
   target:
     name: quay-auth-secret
     template:

charts/hub/quarkuscoffeeshop-pipelines/templates/tekton-pipelines/quarkuscoffeeshop-barista/pipeline/deploy-pipeline.yaml

@@ -1,4 +1,4 @@
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
   name: build-and-push-quarkuscoffeeshop-barista
@@ -25,11 +25,6 @@ spec:
       name: webhook-secret
       type: string
 {{ end }}
-  resources:
-    - name: app-git
-      type: git
-    - name: image
-      type: image
   tasks:
     - name: fetch-repository
       params:

charts/hub/quarkuscoffeeshop-pipelines/templates/tekton-pipelines/quarkuscoffeeshop-barista/tektontasks/pushImageToQuay.yaml

@@ -3,10 +3,6 @@ kind: Task
 metadata:
   name: push-quarkuscoffeeshop-barista-image-to-quay
 spec:
-  resources:
-    inputs:
-      - name: image
-        type: image
   params:
     - default: quarkuscoffeeshop
       description: >-
@@ -35,7 +31,6 @@ spec:
           docker://image-registry.openshift-image-registry.svc:5000/quarkuscoffeeshop-cicd/quarkuscoffeeshop-barista:$(inputs.params.quay-io-image-tag-name)
       image: registry.redhat.io/rhel8/podman
       name: podman-pull-image
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -50,7 +45,6 @@ spec:
         - '$(params.quay-io-repository):$(params.quay-io-image-tag-name)'
       image: registry.redhat.io/rhel8/buildah
       name: buildah-tag-image
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -62,7 +56,6 @@ spec:
         - '--storage-driver=$(params.STORAGE_DRIVER)'
       image: registry.redhat.io/rhel8/buildah
       name: buildah-list-images-after-tagging
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -79,7 +72,6 @@ spec:
           $(params.quay-io-repository):$(params.quay-io-image-tag-name)
       image: registry.redhat.io/rhel8/buildah
       name: push-quarkuscoffeeshop-barista-image-to-quay
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:

charts/hub/quarkuscoffeeshop-pipelines/templates/tekton-pipelines/quarkuscoffeeshop-counter/pipeline/deploy-pipeline.yaml

@@ -1,4 +1,4 @@
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
   name: build-and-push-quarkuscoffeeshop-counter
@@ -25,11 +25,6 @@ spec:
       name: webhook-secret
       type: string
 {{ end }}
-  resources:
-    - name: app-git
-      type: git
-    - name: image
-      type: image
   tasks:
     - name: fetch-repository
       params:

charts/hub/quarkuscoffeeshop-pipelines/templates/tekton-pipelines/quarkuscoffeeshop-counter/tektontasks/pushImageToQuay.yaml

@@ -3,10 +3,6 @@ kind: Task
 metadata:
   name: push-quarkuscoffeeshop-counter-image-to-quay
 spec:
-  resources:
-    inputs:
-      - name: image
-        type: image
   params:
     - default: quarkuscoffeeshop
       description: >-
@@ -35,7 +31,6 @@ spec:
           docker://image-registry.openshift-image-registry.svc:5000/quarkuscoffeeshop-cicd/quarkuscoffeeshop-counter:$(inputs.params.quay-io-image-tag-name)
       image: registry.redhat.io/rhel8/podman
       name: podman-pull-image
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -50,7 +45,6 @@ spec:
         - '$(params.quay-io-repository):$(params.quay-io-image-tag-name)'
       image: registry.redhat.io/rhel8/buildah
       name: buildah-tag-image
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -62,7 +56,6 @@ spec:
         - '--storage-driver=$(params.STORAGE_DRIVER)'
       image: registry.redhat.io/rhel8/buildah
       name: buildah-list-images-after-tagging
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:
@@ -79,7 +72,6 @@ spec:
           $(params.quay-io-repository):$(params.quay-io-image-tag-name)
       image: registry.redhat.io/rhel8/buildah
       name: push-quarkuscoffeeshop-counter-image-to-quay
-      resources: {}
       securityContext:
         privileged: true
       volumeMounts:

charts/hub/quarkuscoffeeshop-pipelines/templates/tekton-pipelines/quarkuscoffeeshop-customerloyalty/pipeline/deploy-pipeline.yaml

@@ -1,4 +1,4 @@
-apiVersion: tekton.dev/v1alpha1
+apiVersion: tekton.dev/v1beta1
 kind: Pipeline
 metadata:
   name: build-and-push-quarkuscoffeeshop-customerloyalty
@@ -25,11 +25,6 @@ spec:
       name: webhook-secret
       type: string
 {{ end }}
-  resources:
-    - name: app-git
-      type: git
-    - name: image
-      type: image
   tasks:
     - name: fetch-repository
       params: