Fix e2e due to a release of Redpanda v24 2 1

src/go/k8s/tests/e2e/update-image-and-node-port/00-assert.yaml

@@ -34,7 +34,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v22.1.11"
+  version: "v23.2.29"
   readyReplicas: 3
   replicas: 3
   upgrading: false

src/go/k8s/tests/e2e/update-image-and-node-port/00-v22-1-11.yaml → src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-2-29.yaml

@@ -23,7 +23,7 @@ metadata:
   name: update-image-cluster-and-node-port
 spec:
   image: "vectorized/redpanda"
-  version: "v22.1.11"
+  version: "v23.2.29"
   replicas: 3
   restartConfig:
     underReplicatedPartitionThreshold: 0
@@ -34,6 +34,8 @@ spec:
     limits:
       cpu: 1
       memory: 1Gi
+    redpanda:
+      memory: 850Mi
   configuration:
     rpcServer:
       port: 33145

src/go/k8s/tests/e2e/update-image-and-node-port/01-create-kminion.yaml

@@ -20,7 +20,7 @@ spec:
         - env:
             - name: CONFIG_FILEPATH
               value: /etc/kminion/config.yaml
-          image: quay.io/cloudhut/kminion:v2.2.0
+          image: redpandadata/kminion:v2.2.8
           imagePullPolicy: IfNotPresent
           name: kminion
           ports:

src/go/k8s/tests/e2e/update-image-and-node-port/02-assert.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.2.13"
+      image: "vectorized/redpanda:v23.3.18"
       volumeMounts:
         - mountPath: /etc/redpanda
           name: config-dir
@@ -37,7 +37,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.2.13"
+      image: "vectorized/redpanda:v23.3.18"
       volumeMounts:
         - mountPath: /etc/redpanda
           name: config-dir
@@ -62,7 +62,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.2.13"
+      image: "vectorized/redpanda:v23.3.18"
       volumeMounts:
         - mountPath: /etc/redpanda
           name: config-dir
@@ -109,7 +109,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v22.2.13"
+  version: "v23.3.18"
   readyReplicas: 3
   replicas: 3
   upgrading: false

src/go/k8s/tests/e2e/update-image-and-node-port/02-v22-2-13-with-si-pv-addition.yaml → src/go/k8s/tests/e2e/update-image-and-node-port/02-v23-3-18-with-si-pv-addition.yaml

@@ -11,7 +11,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 spec:
-  version: "v22.2.13"
+  version: "v23.3.18"
   cloudStorage:
     enabled: true
     accessKey: XXX

src/go/k8s/tests/e2e/update-image-and-node-port/03-assert.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.3.22"
+      image: "vectorized/redpanda:v24.1.13"
 status:
   phase: "Running"
 ---
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.3.22"
+      image: "vectorized/redpanda:v24.1.13"
 status:
   phase: "Running"
 ---
@@ -34,7 +34,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v22.3.22"
+      image: "vectorized/redpanda:v24.1.13"
 status:
   phase: "Running"
 ---
@@ -48,7 +48,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v22.3.22"
+  version: "v24.1.13"
   readyReplicas: 3
   replicas: 3
   upgrading: false

src/go/k8s/tests/e2e/update-image-and-node-port/03-v22-3-22.yaml → src/go/k8s/tests/e2e/update-image-and-node-port/03-v24-1-13.yaml

@@ -4,4 +4,4 @@ metadata:
   name: update-image-cluster-and-node-port
 spec:
   image: "vectorized/redpanda"
-  version: "v22.3.22"
+  version: "v24.1.13"

src/go/k8s/tests/e2e/update-image-and-node-port/04-assert.yaml

@@ -12,7 +12,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v23.1.13"
+      image: "localhost/redpanda:dev"
 status:
   phase: "Running"
 ---
@@ -23,7 +23,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v23.1.13"
+      image: localhost/redpanda:dev
 status:
   phase: "Running"
 ---
@@ -34,7 +34,7 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: "vectorized/redpanda:v23.1.13"
+      image: localhost/redpanda:dev
 status:
   phase: "Running"
 ---
@@ -48,7 +48,7 @@ kind: Cluster
 metadata:
   name: update-image-cluster-and-node-port
 status:
-  version: "v23.1.13"
+  version: "dev"
   readyReplicas: 3
   replicas: 3
   upgrading: false

src/go/k8s/tests/e2e/update-image-and-node-port/05-assert.yaml

@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: wait-for-v23-1-11
+  name: wait-for-tip-of-the-dev
 status:
   conditions:
     - status: "True"

src/go/k8s/tests/e2e/update-image-and-node-port/05-wait-for-config-version.yaml

@@ -1,7 +1,7 @@
 apiVersion: batch/v1
 kind: Job
 metadata:
-  name: wait-for-v23-1-11
+  name: wait-for-tip-of-the-dev
 spec:
   template:
     spec:
@@ -17,14 +17,25 @@ spec:
             - /bin/sh
             - -c
           args:
-            - "set -xe\nCONFIG_VERSION_PATH=\"v1/features\"\n\nfor i in 0 1 2\ndo\n\
-              \  ADMIN_API_PATH=\"http://update-image-cluster-and-node-port-${i}.update-image-cluster-and-node-port.${POD_NAMESPACE}.svc.cluster.local.:9644\"\
-              \n  CLUSTER_VERSION=$(curl -s ${ADMIN_API_PATH}/${CONFIG_VERSION_PATH}\
-              \ | jq -r .cluster_version)\n\n  NODE_LATEST_VERSION=$(curl -s ${ADMIN_API_PATH}/${CONFIG_VERSION_PATH}\
-              \ | jq -r .node_latest_version)\n\n  if [ \"$CLUSTER_VERSION\" -gt \"\
-              $NODE_LATEST_VERSION\" ]; then\n    echo \"failed: Cluster version is\
-              \ ${CLUSTER_VERSION} is greater than ${NODE_LATEST_VERSION}\"\n    exit\
-              \ 1\n  fi\ndone\n\necho \"test passed\"\n"
+            - |
+              set -xe
+              CONFIG_VERSION_PATH="v1/features"
+
+              for i in 0 1 2
+              do
+                ADMIN_API_PATH="http://update-image-cluster-and-node-port-${i}.update-image-cluster-and-node-port.${POD_NAMESPACE}.svc.cluster.local.:9644"
+                CLUSTER_VERSION=$(curl -s ${ADMIN_API_PATH}/${CONFIG_VERSION_PATH} |
+                  jq -r .cluster_version)
+                NODE_LATEST_VERSION=$(curl -s ${ADMIN_API_PATH}/${CONFIG_VERSION_PATH} |
+                  jq -r .node_latest_version)
+
+                if [ "${CLUSTER_VERSION}" -gt "${NODE_LATEST_VERSION}" ]; then
+                  echo "failed: Cluster version ${CLUSTER_VERSION} is greater than ${NODE_LATEST_VERSION}"
+                  exit 1
+                fi
+              done
+
+              echo "test passed"
       restartPolicy: Never
   backoffLimit: 2
   parallelism: 1

src/go/k8s/tests/e2e/update-image-and-node-port/06-assert.yaml

@@ -13,6 +13,18 @@ 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"
 ---
@@ -23,7 +35,19 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: localhost/redpanda:dev
+      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"
 ---
@@ -34,7 +58,19 @@ metadata:
 spec:
   containers:
     - name: redpanda
-      image: localhost/redpanda:dev
+      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"
 ---

src/go/k8s/tests/e2e/update-image-and-node-port/07-assert.yaml

@@ -1,13 +1,3 @@
-apiVersion: batch/v1
-kind: Job
-metadata:
-  name: wait-for-tip-of-the-dev
-status:
-  conditions:
-    - status: "True"
-      type: Complete
-  succeeded: 1
----
 apiVersion: kuttl.dev/v1beta1
 kind: TestAssert
 collectors: