From 9c1cc9e742525f0a44c5c6c13e7b4c13c611233f Mon Sep 17 00:00:00 2001 From: nicolaferraro Date: Tue, 5 Apr 2022 15:38:41 +0200 Subject: [PATCH] operator: fix kuttl tests by avoiding invalid upgrade combinations --- .../00-redpanda-cluster.yaml | 4 ++-- .../centralized-configuration-upgrade/01-first-upgrade.yaml | 4 ++-- .../02-update-to-central-config-with-prop.yaml | 2 +- .../k8s/tests/e2e/update-image-and-node-port/01-assert.yaml | 6 +++--- .../e2e/update-image-and-node-port/01-new-image-and-pv.yaml | 2 +- .../tests/e2e/update-image-tls-client-auth/01-assert.yaml | 4 ++-- .../update-image-tls-client-auth/01-new-image-and-pv.yaml | 2 +- src/go/k8s/tests/e2e/update-image-tls/01-assert.yaml | 4 ++-- .../k8s/tests/e2e/update-image-tls/01-new-image-and-pv.yaml | 2 +- 9 files changed, 15 insertions(+), 15 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 90fb9697ce2f..589bee742eb9 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,8 +4,8 @@ metadata: name: centralized-configuration-upgrade spec: image: "vectorized/redpanda" - version: "v21.11.10" - replicas: 2 + version: "v21.11.11" + replicas: 3 resources: requests: cpu: 100m 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 7c2ae09fc36e..6bdbd67ba5c4 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,8 +4,8 @@ metadata: name: centralized-configuration-upgrade spec: image: "vectorized/redpanda" - version: "v21.11.11" - replicas: 2 + version: "v21.11.12" + replicas: 3 resources: requests: cpu: 100m 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 3119425072a0..a4271452f095 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 @@ -5,7 +5,7 @@ metadata: spec: image: "localhost/redpanda" version: "dev" - replicas: 2 + replicas: 3 resources: requests: cpu: 100m 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 acd2a0f73f2d..4bc38a5099aa 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,7 +14,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v21.11.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir @@ -36,7 +36,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v21.11.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir @@ -86,4 +86,4 @@ kind: Cluster metadata: name: update-image-cluster-and-node-port status: - version: "v21.11.2" + version: "v21.11.12" 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 6ee88ca40ddb..31d110804aa8 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.2" + version: "v21.11.12" cloudStorage: enabled: true accessKey: XXX 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 87fd1c92a538..1ec4478d8450 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.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir @@ -40,7 +40,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v21.11.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir 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 2f08b482bfbf..4b4b31efaaea 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.2" + version: "v21.11.12" cloudStorage: enabled: true accessKey: XXX 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 0620d5859272..e27c78a62c99 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.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir @@ -38,7 +38,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v21.11.2" + image: "vectorized/redpanda:v21.11.12" volumeMounts: - mountPath: /etc/redpanda name: config-dir 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 2f08b482bfbf..4b4b31efaaea 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.2" + version: "v21.11.12" cloudStorage: enabled: true accessKey: XXX