diff --git a/src/go/k8s/tests/e2e/centralized-configuration-tls/00-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/00-assert.yaml index 760dafa8cd71f..efaeda476b5b7 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/00-assert.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/00-assert.yaml @@ -3,7 +3,7 @@ kind: Cluster metadata: name: centralized-configuration-tls status: - replicas: 2 + replicas: 3 restarting: false conditions: - type: ClusterConfigured diff --git a/src/go/k8s/tests/e2e/centralized-configuration-tls/00-redpanda-cluster.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/00-redpanda-cluster.yaml index 000f8c67dbcd9..eeefa1d9643da 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/00-redpanda-cluster.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/00-redpanda-cluster.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/centralized-configuration-tls/01-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/01-assert.yaml index a914890170dbb..e287159e28ece 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/01-assert.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/01-assert.yaml @@ -3,7 +3,7 @@ kind: Cluster metadata: name: centralized-configuration-tls status: - replicas: 2 + replicas: 3 restarting: false conditions: - type: ClusterConfigured diff --git a/src/go/k8s/tests/e2e/centralized-configuration-tls/01-redpanda-cluster-change.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/01-redpanda-cluster-change.yaml index 89f21bdf74cc3..cc1c3e9fd6e69 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/01-redpanda-cluster-change.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/01-redpanda-cluster-change.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/centralized-configuration-tls/03-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/03-assert.yaml index a914890170dbb..e287159e28ece 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/03-assert.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/03-assert.yaml @@ -3,7 +3,7 @@ kind: Cluster metadata: name: centralized-configuration-tls status: - replicas: 2 + replicas: 3 restarting: false conditions: - type: ClusterConfigured diff --git a/src/go/k8s/tests/e2e/centralized-configuration-tls/03-redpanda-cluster-simple-tls.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/03-redpanda-cluster-simple-tls.yaml index 9e45fbe8d8002..935c0d4f2c4a3 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/03-redpanda-cluster-simple-tls.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/03-redpanda-cluster-simple-tls.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/centralized-configuration-tls/04-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/04-assert.yaml index d1d90348d5276..d49e4dde31890 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/04-assert.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/04-assert.yaml @@ -3,7 +3,7 @@ kind: Cluster metadata: name: centralized-configuration-tls status: - replicas: 2 + replicas: 3 restarting: false conditions: - type: ClusterConfigured diff --git a/src/go/k8s/tests/e2e/centralized-configuration-tls/04-redpanda-cluster-change.yaml b/src/go/k8s/tests/e2e/centralized-configuration-tls/04-redpanda-cluster-change.yaml index 8371f7879bc7b..d5fd7de5e4f7e 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-tls/04-redpanda-cluster-change.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-tls/04-redpanda-cluster-change.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/centralized-configuration-upgrade/00-assert.yaml b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/00-assert.yaml index 5f4f7bc8fb088..7b02a4e3012c5 100644 --- a/src/go/k8s/tests/e2e/centralized-configuration-upgrade/00-assert.yaml +++ b/src/go/k8s/tests/e2e/centralized-configuration-upgrade/00-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: centralized-configuration-upgrade status: - readyReplicas: 2 + readyReplicas: 3 --- apiVersion: kuttl.dev/v1beta1 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 958d682186433..683a5f0a60b3e 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 @@ -5,7 +5,7 @@ metadata: spec: image: "vectorized/redpanda" version: "v22.1.10" - replicas: 2 + replicas: 3 resources: requests: cpu: 100m 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 390529ead9cd8..3bd673adb4499 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: centralized-configuration-upgrade status: - readyReplicas: 2 + readyReplicas: 3 --- apiVersion: v1 @@ -30,6 +30,18 @@ status: phase: "Running" --- +apiVersion: v1 +kind: Pod +metadata: + name: centralized-configuration-upgrade-2 +spec: + containers: + - name: redpanda + image: "vectorized/redpanda:v22.1.10" +status: + phase: "Running" +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: 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 958d682186433..683a5f0a60b3e 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 @@ -5,7 +5,7 @@ metadata: spec: image: "vectorized/redpanda" version: "v22.1.10" - replicas: 2 + 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 dd21bcfc91c04..cebc2cf9922e5 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: "vectorized/redpanda" version: "v22.2.8" - replicas: 2 + replicas: 3 resources: requests: cpu: 100m 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 e2dd56f2c8c2c..f30fe5e0b791f 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 @@ -3,23 +3,7 @@ kind: StatefulSet metadata: name: update-image-cluster-and-node-port status: - readyReplicas: 2 - ---- - -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - type: pod - pod: update-image-cluster-and-node-port-0 - ---- - -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - type: pod - pod: update-image-cluster-and-node-port-1 + readyReplicas: 3 --- @@ -59,3 +43,10 @@ metadata: name: update-image-cluster-and-node-port status: version: "v22.1.10" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 4eec97f5e13dd..637020fec0160 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 @@ -24,7 +24,7 @@ metadata: spec: image: "vectorized/redpanda" version: "v22.1.10" - 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 f243155bdb99f..bb09eba915f07 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: update-image-cluster-and-node-port status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -61,6 +61,33 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: update-image-cluster-and-node-port-2 +spec: + containers: + - name: redpanda + 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 + name: shadow-index-cache + - mountPath: /var/run/secrets/kubernetes.io/serviceaccount + readOnly: true +status: + phase: "Running" + +--- + apiVersion: v1 kind: Service metadata: @@ -97,3 +124,10 @@ metadata: name: update-image-cluster-and-node-port status: version: "v22.2.8" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 e4a52d982b613..6aad75303f7c5 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: update-image-cluster-and-node-port status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,6 +33,19 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: update-image-cluster-and-node-port-2 +spec: + containers: + - name: redpanda + image: vectorized/redpanda:v22.3.4 +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: @@ -48,3 +61,10 @@ metadata: name: update-image-cluster-and-node-port status: version: v22.3.4 + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" \ No newline at end of file diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/03-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/03-assert.yaml index 1c5b84b34584b..0223279c5ce42 100644 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/03-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/03-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: update-image-cluster-and-node-port status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,6 +33,19 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: update-image-cluster-and-node-port-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: @@ -48,3 +61,10 @@ metadata: name: update-image-cluster-and-node-port status: version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" \ No newline at end of file diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/04-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/04-assert.yaml index 596f8de812cf0..01e15f31c49fc 100644 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/04-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/04-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: update-image-cluster-and-node-port status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -53,6 +53,28 @@ spec: - mountPath: /var/run/secrets/kubernetes.io/serviceaccount readOnly: true +--- + +apiVersion: v1 +kind: Pod +metadata: + name: update-image-cluster-and-node-port-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" + 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/run/secrets/kubernetes.io/serviceaccount + readOnly: true status: phase: "Running" @@ -64,3 +86,19 @@ collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: update-image-cluster-and-node-port +status: + version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" \ No newline at end of file diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-assert.yaml index bd99dc3c5850e..3669e87004aea 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth/00-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -72,3 +72,19 @@ collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.1.10" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 dd86baf8d7d8a..5c5d8939005a1 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 @@ -5,7 +5,7 @@ metadata: spec: image: "vectorized/redpanda" version: "v22.1.10" - replicas: 2 + replicas: 3 resources: requests: cpu: 100m 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 6bb158264a7c6..b61dc04195d41 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -69,9 +69,56 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + 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/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 + name: shadow-index-cache + - mountPath: /var/run/secrets/kubernetes.io/serviceaccount + readOnly: true +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.2.8" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 03c57c52f72b4..2ca4412317761 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,9 +33,38 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "vectorized/redpanda:v22.3.4" +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.3.4" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/03-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/03-assert.yaml index 7bee3d1f042ee..4e38dd28d4aea 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth/03-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth/03-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,9 +33,38 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth/04-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth/04-assert.yaml index 964a4109675a5..408281de7e63c 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth/04-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth/04-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -65,9 +65,54 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" + volumeMounts: + - mountPath: /etc/redpanda + name: config-dir + - mountPath: /scripts + name: hook-scripts-dir + - mountPath: /etc/tls/certs/admin + 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/run/secrets/kubernetes.io/serviceaccount + readOnly: true +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" diff --git a/src/go/k8s/tests/e2e/update-image-tls/00-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls/00-assert.yaml index f90d0571137d1..f7e6d74f839f6 100644 --- a/src/go/k8s/tests/e2e/update-image-tls/00-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls/00-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -60,3 +60,19 @@ collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.1.10" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 d0005394f00eb..65d5d81df5414 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 @@ -5,7 +5,7 @@ metadata: spec: image: "vectorized/redpanda" version: "v22.1.10" - replicas: 2 + replicas: 3 resources: requests: cpu: 100m 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 73171931ecbab..f62140da199f2 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -65,9 +65,54 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + 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 + name: shadow-index-cache + - mountPath: /var/run/secrets/kubernetes.io/serviceaccount + readOnly: true +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.2.8" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" 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 03c57c52f72b4..6dfabc974b585 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 @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,9 +33,38 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "vectorized/redpanda:v22.3.4" +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "v22.3.4" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" \ No newline at end of file diff --git a/src/go/k8s/tests/e2e/update-image-tls/03-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls/03-assert.yaml index 7bee3d1f042ee..4e38dd28d4aea 100644 --- a/src/go/k8s/tests/e2e/update-image-tls/03-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls/03-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -33,9 +33,38 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True" diff --git a/src/go/k8s/tests/e2e/update-image-tls/04-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls/04-assert.yaml index c1b483e112485..2298a64f34572 100644 --- a/src/go/k8s/tests/e2e/update-image-tls/04-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls/04-assert.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: up-img status: - readyReplicas: 2 + readyReplicas: 3 --- @@ -61,9 +61,52 @@ status: --- +apiVersion: v1 +kind: Pod +metadata: + name: up-img-2 +spec: + containers: + - name: redpanda + image: "localhost/redpanda:dev" + 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/run/secrets/kubernetes.io/serviceaccount + readOnly: true +status: + phase: "Running" + +--- + apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - type: pod selector: app.kubernetes.io/name=redpanda tail: -1 + +--- + +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img +status: + version: "dev" + readyReplicas: 3 + replicas: 3 + upgrading: false + restarting: false + conditions: + - type: ClusterConfigured + status: "True"