k8s: Adjust upgrade end to end tests

Before 22.X the cluster health overview is not available. All tests could not upgrade from 21.X as operator could validate the health status.
RafalKorepta · Nov 29, 2022 · 7beaf40 · 7beaf40
1 parent addb1fa
commit 7beaf40
Show file tree

Hide file tree

Showing 20 changed files with 47 additions and 29 deletions.
diff --git a/src/go/k8s/tests/e2e/centralized-configuration-upgrade/00-redpanda-cluster.yaml b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/00-redpanda-cluster.yaml
@@ -4,7 +4,7 @@ metadata:
   name: centralized-configuration-upgrade
 spec:
   image: "vectorized/redpanda"
-  version: "v21.11.11"
+  version: "v22.1.10"
   replicas: 2
   resources:
     requests:

diff --git a/src/go/k8s/tests/e2e/centralized-configuration-upgrade/01-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/01-assert.yaml
@@ -13,7 +13,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.16"
+    image: "vectorized/redpanda:v22.1.10"
 status:
   phase: "Running"
 ---
@@ -25,7 +25,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v21.11.16"
+      image: "vectorized/redpanda:v22.1.10"
 status:
   phase: "Running"
 ---

diff --git a/src/go/k8s/tests/e2e/centralized-configuration-upgrade/01-first-upgrade.yaml b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/01-first-upgrade.yaml
@@ -4,7 +4,7 @@ metadata:
   name: centralized-configuration-upgrade
 spec:
   image: "vectorized/redpanda"
-  version: "v21.11.16"
+  version: "v22.1.10"
   replicas: 2
   resources:
     requests:

diff --git a/...8s/tests/e2e/centralized-configuration-upgrade/02-update-to-central-config-with-prop.yaml b/...8s/tests/e2e/centralized-configuration-upgrade/02-update-to-central-config-with-prop.yaml
@@ -4,7 +4,7 @@ metadata:
   name: centralized-configuration-upgrade
 spec:
   image: "vectorized/redpanda"
-  version: "v22.2.7"
+  version: "v22.2.8"
   replicas: 2
   resources:
     requests:

diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/00-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/00-assert.yaml
@@ -58,4 +58,4 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v21.11.1"
+  version: "v22.1.10"
diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/00-current-image.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/00-current-image.yaml
@@ -23,7 +23,7 @@ metadata:
   name: update-image-cluster-and-node-port
 spec:
   image: "vectorized/redpanda"
-  version: "v21.11.1"
+  version: "v22.1.10"
   replicas: 2
   resources:
     requests:

diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/01-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/01-assert.yaml
@@ -14,12 +14,15 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
     - mountPath: /scripts
       name: hook-scripts-dir
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache
@@ -38,12 +41,15 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
     - mountPath: /scripts
       name: hook-scripts-dir
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache
@@ -90,4 +96,4 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v21.11.12"
+  version: "v22.2.8"
diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/01-new-image-and-pv.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/01-new-image-and-pv.yaml
@@ -12,7 +12,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 spec:
-  version: "v21.11.12"
+  version: "v22.2.8"
   cloudStorage:
     enabled: true
     accessKey: XXX

diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/02-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/02-assert.yaml
@@ -14,7 +14,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: vectorized/redpanda:v22.2.7
+    image: vectorized/redpanda:v22.3.4
 status:
   phase: "Running"
 
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: vectorized/redpanda:v22.2.7
+    image: vectorized/redpanda:v22.3.4
 status:
   phase: "Running"
 
@@ -47,4 +47,4 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: v22.2.7
+  version: v22.3.4
diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/02-new-image.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/02-new-image.yaml
@@ -4,4 +4,4 @@ metadata:
   name: update-image-cluster-and-node-port
 spec:
   image: "vectorized/redpanda"
-  version: "v22.2.7"
+  version: "v22.3.4"
diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-current-image.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-current-image.yaml
@@ -4,7 +4,7 @@ metadata:
   name: up-img
 spec:
   image: "vectorized/redpanda"
-  version: "v21.11.1"
+  version: "v22.1.10"
   replicas: 2
   resources:
     requests:

diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/01-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/01-assert.yaml
@@ -14,7 +14,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
@@ -24,6 +24,9 @@ spec:
       name: tlsadmincert
     - mountPath: /etc/tls/certs/admin/ca
       name: tlsadminca
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache
@@ -42,7 +45,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
@@ -52,6 +55,9 @@ spec:
       name: tlsadmincert
     - mountPath: /etc/tls/certs/admin/ca
       name: tlsadminca
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache

diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/01-new-image-and-pv.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/01-new-image-and-pv.yaml
@@ -12,7 +12,7 @@ kind: Cluster
 metadata:
   name: up-img
 spec:
-  version: "v21.11.12"
+  version: "v22.2.8"
   cloudStorage:
     enabled: true
     accessKey: XXX

diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/02-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/02-assert.yaml
@@ -14,7 +14,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v22.2.7"
+    image: "vectorized/redpanda:v22.3.4"
 status:
   phase: "Running"
 
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v22.2.7"
+    image: "vectorized/redpanda:v22.3.4"
 status:
   phase: "Running"
 

diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/02-new-image.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/02-new-image.yaml
@@ -4,4 +4,4 @@ metadata:
   name: up-img
 spec:
   image: "vectorized/redpanda"
-  version: "v22.2.7"
+  version: "v22.3.4"
diff --git a/src/go/k8s/tests/e2e/update-image-tls/00-current-image.yaml b/src/go/k8s/tests/e2e/update-image-tls/00-current-image.yaml
@@ -4,7 +4,7 @@ metadata:
   name: up-img
 spec:
   image: "vectorized/redpanda"
-  version: "v21.11.1"
+  version: "v22.1.10"
   replicas: 2
   resources:
     requests:

diff --git a/src/go/k8s/tests/e2e/update-image-tls/01-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls/01-assert.yaml
@@ -14,14 +14,17 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
     - mountPath: /scripts
       name: hook-scripts-dir
     - mountPath: /etc/tls/certs/admin
       name: tlsadmincert
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache
@@ -40,14 +43,17 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v21.11.12"
+    image: "vectorized/redpanda:v22.2.8"
     volumeMounts:
     - mountPath: /etc/redpanda
       name: config-dir
     - mountPath: /scripts
       name: hook-scripts-dir
     - mountPath: /etc/tls/certs/admin
       name: tlsadmincert
+    - mountPath: /etc/redpanda/.bootstrap.yaml
+      name: configmap-dir
+      subPath: .bootstrap.yaml
     - mountPath: /var/lib/redpanda/data
       name: datadir
     - mountPath: /var/lib/shadow-index-cache

diff --git a/src/go/k8s/tests/e2e/update-image-tls/01-new-image-and-pv.yaml b/src/go/k8s/tests/e2e/update-image-tls/01-new-image-and-pv.yaml
@@ -12,7 +12,7 @@ kind: Cluster
 metadata:
   name: up-img
 spec:
-  version: "v21.11.12"
+  version: "v22.2.8"
   cloudStorage:
     enabled: true
     accessKey: XXX

diff --git a/src/go/k8s/tests/e2e/update-image-tls/02-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls/02-assert.yaml
@@ -14,7 +14,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v22.2.7"
+    image: "vectorized/redpanda:v22.3.4"
 status:
   phase: "Running"
 
@@ -27,7 +27,7 @@ metadata:
 spec:
   containers:
   - name: redpanda
-    image: "vectorized/redpanda:v22.2.7"
+    image: "vectorized/redpanda:v22.3.4"
 status:
   phase: "Running"
 

diff --git a/src/go/k8s/tests/e2e/update-image-tls/02-new-image.yaml b/src/go/k8s/tests/e2e/update-image-tls/02-new-image.yaml
@@ -4,4 +4,4 @@ metadata:
   name: up-img
 spec:
   image: "vectorized/redpanda"
-  version: "v22.2.7"
+  version: "v22.3.4"