changes to kuttl tests to make them multi-arch compatible (#477)

* changes to kuttl tests to make them multi-arch compatible * More updates to tests for multiarch --------- Co-authored-by: Leo Christy Jesuraj <[email protected]>
application-stacks · Apr 4, 2023 · 63075c4 · 63075c4
1 parent 43a3b91
commit 63075c4
Show file tree

Hide file tree

Showing 69 changed files with 110 additions and 107 deletions.
diff --git a/bundle/tests/scorecard/kuttl/affinity/00-node-no-affinity.yaml b/bundle/tests/scorecard/kuttl/affinity/00-node-no-affinity.yaml
@@ -4,7 +4,7 @@ kind: RuntimeComponent
 metadata:
   name: affinity-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   affinity:
     nodeAffinityLabels:

diff --git a/bundle/tests/scorecard/kuttl/affinity/01-node-pod-affinity.yaml b/bundle/tests/scorecard/kuttl/affinity/01-node-pod-affinity.yaml
@@ -14,7 +14,7 @@ kind: RuntimeComponent
 metadata:
   name: affinity-other-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   affinity:
     podAffinity:

diff --git a/bundle/tests/scorecard/kuttl/affinity/03-pod-anti-affinity.yaml b/bundle/tests/scorecard/kuttl/affinity/03-pod-anti-affinity.yaml
@@ -4,7 +4,7 @@ kind: RuntimeComponent
 metadata:
   name: anti-affinity-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   affinity:
     podAntiAffinity:

diff --git a/bundle/tests/scorecard/kuttl/affinity/05-node-affinity.yaml b/bundle/tests/scorecard/kuttl/affinity/05-node-affinity.yaml
@@ -4,7 +4,7 @@ kind: RuntimeComponent
 metadata:
   name: affinity-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   affinity:
     nodeAffinity:

diff --git a/bundle/tests/scorecard/kuttl/annotations/00-rc-deployment.yaml b/bundle/tests/scorecard/kuttl/annotations/00-rc-deployment.yaml
@@ -7,7 +7,7 @@ metadata:
     conflict: component
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   deployment:
     annotations:

diff --git a/bundle/tests/scorecard/kuttl/auto1/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/auto1/00-runtime-basic.yaml
@@ -4,5 +4,5 @@ metadata:
   name: autoscaling1-rc
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
diff --git a/bundle/tests/scorecard/kuttl/auto2/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/auto2/00-runtime-basic.yaml
@@ -4,5 +4,5 @@ metadata:
   name: scale2-runtime-component
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
diff --git a/bundle/tests/scorecard/kuttl/auto3/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/auto3/00-runtime-basic.yaml
@@ -4,5 +4,5 @@ metadata:
   name: scale3-runtime-component
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
diff --git a/bundle/tests/scorecard/kuttl/basic/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/basic/00-runtime-basic.yaml
@@ -4,6 +4,6 @@ metadata:
   name: example-runtime-component
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
 
diff --git a/bundle/tests/scorecard/kuttl/day2operation/00-runtime.yaml b/bundle/tests/scorecard/kuttl/day2operation/00-runtime.yaml
@@ -4,7 +4,7 @@ metadata:
   name: day2-operation-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   statefulSet:
     storage:

diff --git a/bundle/tests/scorecard/kuttl/deployment-strategy/00-runtime-rolling-update.yaml b/bundle/tests/scorecard/kuttl/deployment-strategy/00-runtime-rolling-update.yaml
@@ -4,7 +4,7 @@ metadata:
   name: deployment-strategy-rc
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 3
   deployment:
     updateStrategy:

diff --git a/bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml b/bundle/tests/scorecard/kuttl/env/01-runtime-env.yaml
@@ -4,7 +4,7 @@ metadata:
   name: env-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   env:
     - name: TEST_VALUE

diff --git a/bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml b/bundle/tests/scorecard/kuttl/env/03-runtime-statefulset-env.yaml
@@ -4,7 +4,7 @@ metadata:
   name: env-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   statefulSet: {}
   env:

diff --git a/...sts/scorecard/kuttl/stream/00-assert.yaml → ...orecard/kuttl/image-stream/00-assert.yaml b/...sts/scorecard/kuttl/stream/00-assert.yaml → ...orecard/kuttl/image-stream/00-assert.yaml
@@ -6,11 +6,11 @@ spec:
   tags:
   - from:
       kind: DockerImage
-      name: navidsh/demo-day:v0.1.0
+      name: icr.io/appcafe/open-liberty:23.0.0.1-full-java8-openj9-ubi
     name: latest
 status:
   tags:
   - tag: latest
     items:
-    - image: sha256:b441e81a681df8fdf6922f00318fb78d15dea7f24823eef58b2480aa84aba823
+    - image: sha256:928559729352bfc852388b0b0db6c99593c9964c67f63ee5081fef27a4eeaa74
 
diff --git a/...corecard/kuttl/stream/00-imagestream.yaml → ...rd/kuttl/image-stream/00-imagestream.yaml b/...corecard/kuttl/stream/00-imagestream.yaml → ...rd/kuttl/image-stream/00-imagestream.yaml
@@ -6,6 +6,6 @@ spec:
   tags:
   - from:
       kind: DockerImage
-      name: navidsh/demo-day:v0.1.0
+      name: icr.io/appcafe/open-liberty:23.0.0.1-full-java8-openj9-ubi
     name: latest
 
diff --git a/...sts/scorecard/kuttl/stream/01-assert.yaml → ...orecard/kuttl/image-stream/01-assert.yaml b/...sts/scorecard/kuttl/stream/01-assert.yaml → ...orecard/kuttl/image-stream/01-assert.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - image: navidsh/demo-day@sha256:b441e81a681df8fdf6922f00318fb78d15dea7f24823eef58b2480aa84aba823
+      - image: icr.io/appcafe/open-liberty@sha256:928559729352bfc852388b0b0db6c99593c9964c67f63ee5081fef27a4eeaa74
 status:
   replicas: 1
   readyReplicas: 1
@@ -16,7 +16,7 @@ apiVersion: v1
 kind: Pod
 spec:
   containers:
-  - image: navidsh/demo-day@sha256:b441e81a681df8fdf6922f00318fb78d15dea7f24823eef58b2480aa84aba823
+  - image: icr.io/appcafe/open-liberty@sha256:928559729352bfc852388b0b0db6c99593c9964c67f63ee5081fef27a4eeaa74
 metadata:
   labels:
     app.kubernetes.io/instance: imagestream-rc
diff --git a/...recard/kuttl/stream/01-runtime-basic.yaml → .../kuttl/image-stream/01-runtime-basic.yaml b/...recard/kuttl/stream/01-runtime-basic.yaml → .../kuttl/image-stream/01-runtime-basic.yaml
diff --git a/...sts/scorecard/kuttl/stream/02-assert.yaml → ...orecard/kuttl/image-stream/02-assert.yaml b/...sts/scorecard/kuttl/stream/02-assert.yaml → ...orecard/kuttl/image-stream/02-assert.yaml
@@ -11,7 +11,7 @@ apiVersion: v1
 kind: Pod
 spec:
   containers:
-  - image: navidsh/demo-day@sha256:391a9cc130bb96e6b4c3ea0f1c0ac8ae231a5d10a34232e6efd46ab5a6162472
+  - image: icr.io/appcafe/open-liberty@sha256:3d8bfaf38927e0feb81357de701b500df129547304594d54944e75c7b15930a9
 metadata:
   labels:
     app.kubernetes.io/instance: imagestream-rc
diff --git a/...orecard/kuttl/stream/02-image-update.yaml → ...d/kuttl/image-stream/02-image-update.yaml b/...orecard/kuttl/stream/02-image-update.yaml → ...d/kuttl/image-stream/02-image-update.yaml
@@ -6,6 +6,6 @@ spec:
   tags:
   - from:
       kind: DockerImage
-      name: navidsh/demo-day:v0.2.0
+      name: icr.io/appcafe/open-liberty:23.0.0.2-full-java8-openj9-ubi
     name: latest
 
diff --git a/...sts/scorecard/kuttl/stream/03-assert.yaml → ...orecard/kuttl/image-stream/03-assert.yaml b/...sts/scorecard/kuttl/stream/03-assert.yaml → ...orecard/kuttl/image-stream/03-assert.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - image: navidsh/demo-day@sha256:b441e81a681df8fdf6922f00318fb78d15dea7f24823eef58b2480aa84aba823
+      - image: icr.io/appcafe/open-liberty@sha256:928559729352bfc852388b0b0db6c99593c9964c67f63ee5081fef27a4eeaa74
 status:
   replicas: 1
   readyReplicas: 1
@@ -19,4 +19,4 @@ metadata:
     app.kubernetes.io/instance: imagestream-rc
 spec:
   containers:
-  - image: navidsh/demo-day@sha256:b441e81a681df8fdf6922f00318fb78d15dea7f24823eef58b2480aa84aba823
+  - image: icr.io/appcafe/open-liberty@sha256:928559729352bfc852388b0b0db6c99593c9964c67f63ee5081fef27a4eeaa74
diff --git a/...orecard/kuttl/stream/03-image-revert.yaml → ...d/kuttl/image-stream/03-image-revert.yaml b/...orecard/kuttl/stream/03-image-revert.yaml → ...d/kuttl/image-stream/03-image-revert.yaml
@@ -6,6 +6,6 @@ spec:
   tags:
   - from:
       kind: DockerImage
-      name: navidsh/demo-day:v0.1.0
+      name: icr.io/appcafe/open-liberty:23.0.0.1-full-java8-openj9-ubi
     name: latest
 
diff --git a/...sts/scorecard/kuttl/stream/04-assert.yaml → ...orecard/kuttl/image-stream/04-assert.yaml b/...sts/scorecard/kuttl/stream/04-assert.yaml → ...orecard/kuttl/image-stream/04-assert.yaml
@@ -6,7 +6,7 @@ spec:
   template:
     spec:
       containers:
-      - image: navidsh/demo-day
+      - image: icr.io/appcafe/open-liberty
 status:
   replicas: 1
   readyReplicas: 1
@@ -16,7 +16,7 @@ apiVersion: v1
 kind: Pod
 spec:
   containers:
-  - image: navidsh/demo-day
+  - image: icr.io/appcafe/open-liberty
 metadata:
   labels:
     app.kubernetes.io/instance: imagestream-rc
diff --git a/...rd/kuttl/stream/04-runtime-no-stream.yaml → ...tl/image-stream/04-runtime-no-stream.yaml b/...rd/kuttl/stream/04-runtime-no-stream.yaml → ...tl/image-stream/04-runtime-no-stream.yaml
@@ -4,5 +4,5 @@ metadata:
   name: imagestream-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
 
diff --git a/...scorecard/kuttl/stream/05-delete-all.yaml → ...ard/kuttl/image-stream/05-delete-all.yaml b/...scorecard/kuttl/stream/05-delete-all.yaml → ...ard/kuttl/image-stream/05-delete-all.yaml
diff --git a/bundle/tests/scorecard/kuttl/init-deployment/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/init-deployment/00-runtime-basic.yaml
@@ -4,5 +4,5 @@ metadata:
   name: init-runtime-deployment
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
diff --git a/bundle/tests/scorecard/kuttl/init-stateful/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/init-stateful/00-runtime-basic.yaml
@@ -4,6 +4,6 @@ metadata:
   name: init-runtime-stateful
 spec:
   # Add fields here
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   statefulSet: {}
diff --git a/bundle/tests/scorecard/kuttl/knative/00-runtime-no-knative.yaml b/bundle/tests/scorecard/kuttl/knative/00-runtime-no-knative.yaml
@@ -6,7 +6,7 @@ metadata:
   name: knative1-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   createKnativeService: false
 
diff --git a/bundle/tests/scorecard/kuttl/knative2/00-runtime-knative.yaml b/bundle/tests/scorecard/kuttl/knative2/00-runtime-knative.yaml
@@ -4,7 +4,7 @@ metadata:
   name: knative2-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   createKnativeService: true
 
diff --git a/bundle/tests/scorecard/kuttl/manage-tls/00-certmanager-with-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/00-certmanager-with-manage-tls.yaml
@@ -4,7 +4,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   service:

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/01-certmanager-without-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/01-certmanager-without-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   manageTLS: false # Deletes the *-svc-tls-cm CertManager Certificate

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/02-certmanager-statefulset-with-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/02-certmanager-statefulset-with-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   manageTLS: true

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/03-service-ca-statefulset-with-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/03-service-ca-statefulset-with-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   service:

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/05-service-ca-with-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/05-service-ca-with-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   manageTLS: true

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/06-service-ca-without-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/06-service-ca-without-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   manageTLS: false # Disables usage of OpenShift service CA

diff --git a/bundle/tests/scorecard/kuttl/manage-tls/08-byo-with-manage-tls.yaml b/bundle/tests/scorecard/kuttl/manage-tls/08-byo-with-manage-tls.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: manage-tls-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   replicas: 1
   expose: true
   manageTLS: true

diff --git a/bundle/tests/scorecard/kuttl/monitor/00-runtime-basic.yaml b/bundle/tests/scorecard/kuttl/monitor/00-runtime-basic.yaml
@@ -4,7 +4,7 @@ metadata:
   name: service-monitor-rc
 spec:
   # Add fields here
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   service:
     type: "ClusterIP"
     port: 3000

diff --git a/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-multiple-network-policies.yaml b/bundle/tests/scorecard/kuttl/network-policy-multiple-apps/00-multiple-network-policies.yaml
@@ -4,7 +4,7 @@ metadata:
   name: network-policy-frontend-rc
 spec:
   applicationName: network-policy-test
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   expose: true
   service:
     port: 9080
@@ -18,7 +18,7 @@ metadata:
   name: network-policy-backend-rc
 spec:
   applicationName: network-policy-test
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   service:
     port: 9080
     ports:

diff --git a/bundle/tests/scorecard/kuttl/network-policy/00-network-policy-enabled-default.yaml b/bundle/tests/scorecard/kuttl/network-policy/00-network-policy-enabled-default.yaml
@@ -3,6 +3,6 @@ kind: RuntimeComponent
 metadata:
   name: network-policy-rc
 spec:
-  applicationImage: k8s.gcr.io/pause:2.0
+  applicationImage: k8s.gcr.io/pause:3.2
   service:
     port: 8080
diff --git a/bundle/tests/scorecard/kuttl/nodeport/00-add-nodeport.yaml b/bundle/tests/scorecard/kuttl/nodeport/00-add-nodeport.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: nodeport-rc
 spec:
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   service:
     nodePort: 30000
     port: 3000

diff --git a/bundle/tests/scorecard/kuttl/persistent-storage/00-persistent-storage-rc.yaml b/bundle/tests/scorecard/kuttl/persistent-storage/00-persistent-storage-rc.yaml
@@ -3,7 +3,7 @@ kind: RuntimeComponent
 metadata:
   name: persistent-rc
 spec:
-  applicationImage: navidsh/demo-day
+  applicationImage: icr.io/appcafe/open-liberty
   replicas: 1
   volumeMounts:
     - name: pvc

diff --git a/bundle/tests/scorecard/kuttl/probe/00-assert.yaml b/bundle/tests/scorecard/kuttl/probe/00-assert.yaml
@@ -15,20 +15,11 @@ spec:
       containers:
         - readinessProbe:
             initialDelaySeconds: 1
-            httpGet:
-              path: "/"
-              port: 3000
           livenessProbe:
-            initialDelaySeconds: 4
-            httpGet:
-              path: "/"
-              port: 3000
+            initialDelaySeconds: 8
           startupProbe:
             failureThreshold: 10
             periodSeconds: 5
-            httpGet:
-              path: "/"
-              port: 3000
 status:
   replicas: 1
   readyReplicas: 1