From 7beaf40dadbca474f8ffe63ae3bd74a35fa5c350 Mon Sep 17 00:00:00 2001 From: Rafal Korepta Date: Wed, 30 Nov 2022 00:12:04 +0100 Subject: [PATCH] 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. --- .../00-redpanda-cluster.yaml | 2 +- .../centralized-configuration-upgrade/01-assert.yaml | 4 ++-- .../01-first-upgrade.yaml | 2 +- .../02-update-to-central-config-with-prop.yaml | 2 +- .../e2e/update-image-and-node-port/00-assert.yaml | 2 +- .../update-image-and-node-port/00-current-image.yaml | 2 +- .../e2e/update-image-and-node-port/01-assert.yaml | 12 +++++++++--- .../01-new-image-and-pv.yaml | 2 +- .../e2e/update-image-and-node-port/02-assert.yaml | 6 +++--- .../e2e/update-image-and-node-port/02-new-image.yaml | 2 +- .../00-current-image.yaml | 2 +- .../e2e/update-image-tls-client-auth/01-assert.yaml | 10 ++++++++-- .../01-new-image-and-pv.yaml | 2 +- .../e2e/update-image-tls-client-auth/02-assert.yaml | 4 ++-- .../update-image-tls-client-auth/02-new-image.yaml | 2 +- .../tests/e2e/update-image-tls/00-current-image.yaml | 2 +- src/go/k8s/tests/e2e/update-image-tls/01-assert.yaml | 10 ++++++++-- .../e2e/update-image-tls/01-new-image-and-pv.yaml | 2 +- src/go/k8s/tests/e2e/update-image-tls/02-assert.yaml | 4 ++-- .../k8s/tests/e2e/update-image-tls/02-new-image.yaml | 2 +- 20 files changed, 47 insertions(+), 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 index 7c2ae09fc36ec..958d682186433 100644 --- 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 index 855fa42d40079..390529ead9cd8 100644 --- 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 index 1fb941917d5f7..958d682186433 100644 --- 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/src/go/k8s/tests/e2e/centralized-configuration-upgrade/02-update-to-central-config-with-prop.yaml b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/02-update-to-central-config-with-prop.yaml index aa8c1640de50a..dd21bcfc91c04 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-upgrade/02-update-to-central-config-with-prop.yaml +++ b/src/go/k8s/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 index 4e1089e18a37b..e2dd56f2c8c2c 100644 --- 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 index 73e3d73fc3784..4eec97f5e13dd 100644 --- 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 index 3c84d64bb11db..f243155bdb99f 100644 --- 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 index 31d110804aa8b..093656f73fac6 100644 --- 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 index 34393f3dc4bb6..e4a52d982b613 100644 --- 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 index d5cb962c813a9..bdce10ff9d652 100644 --- 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 index fbaf9ceb16f66..dd86baf8d7d8a 100644 --- 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 index 363f40b90bda1..6bb158264a7c6 100644 --- 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 index 4b4b31efaaeac..01489ade60657 100644 --- 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 index 7d480ead821c4..03c57c52f72b4 100644 --- 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 index b703a20991e4c..fd14223c40818 100644 --- 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 index d9290b6dcb1f1..d0005394f00eb 100644 --- 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 index 536cd30490f72..73171931ecbab 100644 --- 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,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 @@ -22,6 +22,9 @@ spec: 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,7 +43,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 @@ -48,6 +51,9 @@ spec: 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 index 4b4b31efaaeac..01489ade60657 100644 --- 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 index 7d480ead821c4..03c57c52f72b4 100644 --- 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 index b703a20991e4c..fd14223c40818 100644 --- 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"