diff --git a/src/go/k8s/Makefile b/src/go/k8s/Makefile index a28bba6b5..87c97a4af 100644 --- a/src/go/k8s/Makefile +++ b/src/go/k8s/Makefile @@ -124,7 +124,7 @@ push-to-kind: kind-create certmanager-install # Execute end to end tests e2e-tests: - cd ../../.. && nix develop -c ./task k8s:run-k8s-tests + cd ../../.. && nix develop -c ./task k8s:run-kuttl-tests # Execute end to end tests v2 e2e-tests-v2: kuttl 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 700ecadac..e33cf17d6 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 @@ -34,7 +34,7 @@ kind: Cluster metadata: name: update-image-cluster-and-node-port status: - version: "v23.2.29" + version: "v23.3.20" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-2-29.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-3-20.yaml similarity index 91% rename from src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-2-29.yaml rename to src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-3-20.yaml index 8bf7227eb..7dde8d421 100644 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-2-29.yaml +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/00-v23-3-20.yaml @@ -23,7 +23,7 @@ metadata: name: update-image-cluster-and-node-port spec: image: "vectorized/redpanda" - version: "v23.2.29" + version: "v23.3.20" replicas: 3 restartConfig: underReplicatedPartitionThreshold: 0 @@ -49,5 +49,7 @@ spec: enabled: true developerMode: true additionalCommandlineArguments: + default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 100M + logger-log-level=exception=info:io: info 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 af7d5c891..6371e1247 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 @@ -12,21 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "vectorized/redpanda:v24.1.15" status: phase: "Running" --- @@ -37,21 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "vectorized/redpanda:v24.1.15" status: phase: "Running" --- @@ -62,21 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "vectorized/redpanda:v24.1.15" status: phase: "Running" --- @@ -109,7 +67,7 @@ kind: Cluster metadata: name: update-image-cluster-and-node-port status: - version: "v23.3.18" + version: "v24.1.15" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/02-v23-3-18-with-si-pv-addition.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/02-v23-3-18-with-si-pv-addition.yaml deleted file mode 100644 index 8beab10e0..000000000 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/02-v23-3-18-with-si-pv-addition.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -data: - archival-update-image-and-node-port: WA== -kind: Secret -metadata: - creationTimestamp: null - name: archival-update-image-and-node-port ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: update-image-cluster-and-node-port -spec: - version: "v23.3.18" - cloudStorage: - enabled: true - accessKey: XXX - secretKeyRef: - namespace: redpanda-system - name: archival-update-image-and-node-port - region: europe-west1 - bucket: X - apiEndpoint: storage.googleapis.com - cacheStorage: - capacity: 1Gi - storageClassName: standard diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/02-v24-1-15.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/02-v24-1-15.yaml new file mode 100644 index 000000000..beea583e5 --- /dev/null +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/02-v24-1-15.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +data: + archival-update-image-and-node-port: WA== +kind: Secret +metadata: + creationTimestamp: null + name: archival-update-image-and-node-port +--- +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: update-image-cluster-and-node-port +spec: + version: "v24.1.15" 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 bd13fe2d7..5b2f260a1 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 @@ -12,7 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -23,7 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: localhost/redpanda:dev status: phase: "Running" --- @@ -34,7 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.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: "v24.1.13" + version: "dev" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/04-tip-of-the-dev.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/03-latest-release.yaml similarity index 87% rename from src/go/k8s/tests/e2e/update-image-and-node-port/04-tip-of-the-dev.yaml rename to src/go/k8s/tests/e2e/update-image-and-node-port/03-latest-release.yaml index d26dfd59d..33cae6d27 100644 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/04-tip-of-the-dev.yaml +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/03-latest-release.yaml @@ -10,3 +10,4 @@ spec: default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 0M + logger-log-level=exception=info:io: info diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/03-v24-1-13.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/03-v24-1-13.yaml deleted file mode 100644 index 4eb531809..000000000 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/03-v24-1-13.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: update-image-cluster-and-node-port -spec: - image: "vectorized/redpanda" - version: "v24.1.13" 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 5b2f260a1..53011d76f 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 @@ -1,58 +1,14 @@ -apiVersion: apps/v1 -kind: StatefulSet +apiVersion: batch/v1 +kind: Job metadata: - name: update-image-cluster-and-node-port + name: wait-for-tip-of-the-dev status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: update-image-cluster-and-node-port-0 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: update-image-cluster-and-node-port-1 -spec: - containers: - - name: redpanda - image: localhost/redpanda:dev -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: update-image-cluster-and-node-port-2 -spec: - containers: - - name: redpanda - image: localhost/redpanda:dev -status: - phase: "Running" + conditions: + - status: "True" + type: Complete + succeeded: 1 --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - command: ../../../hack/get-redpanda-info.sh ---- -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" diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/05-wait-for-config-version.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/04-wait-for-config-version.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-and-node-port/05-wait-for-config-version.yaml rename to src/go/k8s/tests/e2e/update-image-and-node-port/04-wait-for-config-version.yaml diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/05-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/05-assert.yaml index 53011d76f..e2c6efb5d 100644 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/05-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-and-node-port/05-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: diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/07-clean.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/05-clean.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-and-node-port/07-clean.yaml rename to src/go/k8s/tests/e2e/update-image-and-node-port/05-clean.yaml diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/06-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/06-assert.yaml deleted file mode 100644 index 65f1772e6..000000000 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/06-assert.yaml +++ /dev/null @@ -1,94 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: update-image-cluster-and-node-port -status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: update-image-cluster-and-node-port-0 -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" ---- -apiVersion: v1 -kind: Pod -metadata: - name: update-image-cluster-and-node-port-1 -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" ---- -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" ---- -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - command: ../../../hack/get-redpanda-info.sh ---- -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" diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/06-disable-cloud-storage.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/06-disable-cloud-storage.yaml deleted file mode 100644 index 506204df2..000000000 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/06-disable-cloud-storage.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: update-image-cluster-and-node-port -spec: - cloudStorage: - enabled: false diff --git a/src/go/k8s/tests/e2e/update-image-and-node-port/07-assert.yaml b/src/go/k8s/tests/e2e/update-image-and-node-port/07-assert.yaml deleted file mode 100644 index e2c6efb5d..000000000 --- a/src/go/k8s/tests/e2e/update-image-and-node-port/07-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - command: ../../../hack/get-redpanda-info.sh diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-assert.yaml index 40de13ce4..d65f8a61a 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-assert.yaml @@ -80,7 +80,7 @@ kind: Cluster metadata: name: update-img-external-client-ca status: - version: "v24.1.13" + version: "v24.1.15" readyReplicas: 1 replicas: 1 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-13.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-15.yaml similarity index 94% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-13.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-15.yaml index bb4628192..d031b8e3d 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-13.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/01-v24-1-15.yaml @@ -3,8 +3,8 @@ kind: Cluster metadata: name: update-img-external-client-ca spec: - image: "vectorized/redpanda" - version: "v24.1.13" + image: "redpandadata/redpanda" + version: "v24.1.15" replicas: 1 resources: requests: diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/06-update-to-dev-external-client-ca.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/06-update-to-latest-release-external-client-ca.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/06-update-to-dev-external-client-ca.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-external-ca/06-update-to-latest-release-external-client-ca.yaml diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-assert.yaml index dca3ee00c..a689af561 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-assert.yaml @@ -65,7 +65,7 @@ kind: Cluster metadata: name: up-img-admin-mtls status: - version: "v23.2.29" + version: "v23.3.20" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-2-29.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-3-20.yaml similarity index 85% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-2-29.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-3-20.yaml index 4195b6cd2..d9f03523a 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-2-29.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/00-v23-3-20.yaml @@ -3,8 +3,8 @@ kind: Cluster metadata: name: up-img-admin-mtls spec: - image: "vectorized/redpanda" - version: "v23.2.29" + image: "redpandadata/redpanda" + version: "v23.3.20" replicas: 3 resources: requests: @@ -30,3 +30,4 @@ spec: default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 100M + logger-log-level=exception=info:io: info diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-assert.yaml index 06e83953f..0867c0a96 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-assert.yaml @@ -12,25 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -41,25 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -70,25 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -102,7 +48,7 @@ kind: Cluster metadata: name: up-img-admin-mtls status: - version: "v23.3.18" + version: "v24.1.15" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v23-3-18-with-si-pv-addition.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v23-3-18-with-si-pv-addition.yaml deleted file mode 100644 index 0f4cf1fe1..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v23-3-18-with-si-pv-addition.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -data: - archival-update-image-tls-client-auth: WA== -kind: Secret -metadata: - creationTimestamp: null - name: archival-update-image-tls-client-auth ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-mtls -spec: - version: "v23.3.18" - cloudStorage: - enabled: true - accessKey: XXX - secretKeyRef: - namespace: redpanda-system - name: archival-update-image-tls-client-auth - region: europe-west1 - bucket: X - apiEndpoint: storage.googleapis.com - cacheStorage: - capacity: 1Gi - storageClassName: standard diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v24-1-15.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v24-1-15.yaml new file mode 100644 index 000000000..7299d82ea --- /dev/null +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/02-v24-1-15.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +data: + archival-update-image-tls-client-auth: WA== +kind: Secret +metadata: + creationTimestamp: null + name: archival-update-image-tls-client-auth +--- +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img-admin-mtls +spec: + version: "v24.1.15" diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-assert.yaml index cfdef5ef1..c4ed226de 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-assert.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -23,7 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -34,7 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -48,7 +48,7 @@ kind: Cluster metadata: name: up-img-admin-mtls status: - version: "v24.1.13" + version: "dev" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-tip-of-the-dev.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-latest-release.yaml similarity index 86% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-tip-of-the-dev.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-latest-release.yaml index 4b45df51b..f98ebf334 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-tip-of-the-dev.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-latest-release.yaml @@ -10,3 +10,4 @@ spec: default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 0M + logger-log-level=exception=info:io: info diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-v24-1-13.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-v24-1-13.yaml deleted file mode 100644 index b578bce92..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/03-v24-1-13.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-mtls -spec: - image: "vectorized/redpanda" - version: "v24.1.13" diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-assert.yaml index c4ed226de..4637a2332 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-assert.yaml @@ -1,58 +1,14 @@ -apiVersion: apps/v1 -kind: StatefulSet +apiVersion: batch/v1 +kind: Job metadata: - name: up-img-admin-mtls + name: wait-for-tip-of-the-dev-mtls status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-0 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-1 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-2 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" + conditions: + - status: "True" + type: Complete + succeeded: 1 --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - command: ../../../hack/get-redpanda-info.sh ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-mtls -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-no-external-ca/05-wait-for-config-version.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-wait-for-config-version.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-wait-for-config-version.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/04-wait-for-config-version.yaml diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-assert.yaml index 4637a2332..e2c6efb5d 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-assert.yaml @@ -1,13 +1,3 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: wait-for-tip-of-the-dev-mtls -status: - conditions: - - status: "True" - type: Complete - succeeded: 1 ---- apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/07-clean.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-clean.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/07-clean.yaml rename to src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/05-clean.yaml diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/06-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/06-assert.yaml deleted file mode 100644 index 0751041d4..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/06-assert.yaml +++ /dev/null @@ -1,106 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: up-img-admin-mtls -status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-0 -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: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-1 -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: v1 -kind: Pod -metadata: - name: up-img-admin-mtls-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: - - command: ../../../hack/get-redpanda-info.sh ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-mtls -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-no-external-ca/06-disable-cloud-storage.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/06-disable-cloud-storage.yaml deleted file mode 100644 index 808284de3..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/06-disable-cloud-storage.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-mtls -spec: - cloudStorage: - enabled: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/07-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/07-assert.yaml deleted file mode 100644 index e2c6efb5d..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-client-auth-no-external-ca/07-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - command: ../../../hack/get-redpanda-info.sh diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-assert.yaml index 299a997f5..013e38841 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-assert.yaml @@ -55,7 +55,7 @@ kind: Cluster metadata: name: up-img-admin-tls status: - version: "v23.2.29" + version: "v23.3.20" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-2-29.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-3-20.yaml similarity index 84% rename from src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-2-29.yaml rename to src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-3-20.yaml index 27d7ee78c..b2cb839ea 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-2-29.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/00-v23-3-20.yaml @@ -3,8 +3,8 @@ kind: Cluster metadata: name: up-img-admin-tls spec: - image: "vectorized/redpanda" - version: "v23.2.29" + image: "redpandadata/redpanda" + version: "v23.3.20" replicas: 3 resources: requests: @@ -29,3 +29,4 @@ spec: default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 100M + logger-log-level=exception=info:io: info diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-assert.yaml index 355540313..df89751c4 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-assert.yaml @@ -12,23 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -39,23 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -66,23 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v23.3.18" - 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 + image: "redpandadata/redpanda:v24.1.15" status: phase: "Running" --- @@ -96,7 +48,7 @@ kind: Cluster metadata: name: up-img-admin-tls status: - version: "v23.3.18" + version: "v24.1.15" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v23-3-18-with-si-pv-addition.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v23-3-18-with-si-pv-addition.yaml deleted file mode 100644 index 3e0e7d1d7..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v23-3-18-with-si-pv-addition.yaml +++ /dev/null @@ -1,26 +0,0 @@ -apiVersion: v1 -data: - archival-update-image-tls: WA== -kind: Secret -metadata: - creationTimestamp: null - name: archival-update-image-tls ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-tls -spec: - version: "v23.3.18" - cloudStorage: - enabled: true - accessKey: XXX - secretKeyRef: - namespace: redpanda-system - name: archival-update-image-tls - region: europe-west1 - bucket: X - apiEndpoint: storage.googleapis.com - cacheStorage: - capacity: 1Gi - storageClassName: standard diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v24-1-15.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v24-1-15.yaml new file mode 100644 index 000000000..e524e7a3c --- /dev/null +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/02-v24-1-15.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +data: + archival-update-image-tls: WA== +kind: Secret +metadata: + creationTimestamp: null + name: archival-update-image-tls +--- +apiVersion: redpanda.vectorized.io/v1alpha1 +kind: Cluster +metadata: + name: up-img-admin-tls +spec: + version: "v24.1.15" diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-assert.yaml index b097d78df..ff9d40d42 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-assert.yaml @@ -12,7 +12,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -23,7 +23,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -34,7 +34,7 @@ metadata: spec: containers: - name: redpanda - image: "vectorized/redpanda:v24.1.13" + image: "localhost/redpanda:dev" status: phase: "Running" --- @@ -48,7 +48,7 @@ kind: Cluster metadata: name: up-img-admin-tls status: - version: "v24.1.13" + version: "dev" readyReplicas: 3 replicas: 3 upgrading: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-tip-of-the-dev.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-latest-release.yaml similarity index 86% rename from src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-tip-of-the-dev.yaml rename to src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-latest-release.yaml index 789f9e259..5d9254850 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-tip-of-the-dev.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-latest-release.yaml @@ -10,3 +10,4 @@ spec: default-log-level: trace dump-memory-diagnostics-on-alloc-failure-kind: all reserve-memory: 0M + logger-log-level=exception=info:io: info diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-v24-1-13.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-v24-1-13.yaml deleted file mode 100644 index 968fc0714..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/03-v24-1-13.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-tls -spec: - image: "vectorized/redpanda" - version: "v24.1.13" diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-assert.yaml index ff9d40d42..814846c94 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-assert.yaml @@ -1,58 +1,14 @@ -apiVersion: apps/v1 -kind: StatefulSet +apiVersion: batch/v1 +kind: Job metadata: - name: up-img-admin-tls + name: wait-for-tip-of-the-dev-tls status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-tls-0 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-tls-1 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-tls-2 -spec: - containers: - - name: redpanda - image: "localhost/redpanda:dev" -status: - phase: "Running" + conditions: + - status: "True" + type: Complete + succeeded: 1 --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: - command: ../../../hack/get-redpanda-info.sh ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-tls -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-no-client-auth/05-wait-for-config-version.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-wait-for-config-version.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-wait-for-config-version.yaml rename to src/go/k8s/tests/e2e/update-image-tls-no-client-auth/04-wait-for-config-version.yaml diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-assert.yaml index 814846c94..e2c6efb5d 100644 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-assert.yaml +++ b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-assert.yaml @@ -1,13 +1,3 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: wait-for-tip-of-the-dev-tls -status: - conditions: - - status: "True" - type: Complete - succeeded: 1 ---- apiVersion: kuttl.dev/v1beta1 kind: TestAssert collectors: diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/07-clean.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-clean.yaml similarity index 100% rename from src/go/k8s/tests/e2e/update-image-tls-no-client-auth/07-clean.yaml rename to src/go/k8s/tests/e2e/update-image-tls-no-client-auth/05-clean.yaml diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/06-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/06-assert.yaml deleted file mode 100644 index fd95936aa..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/06-assert.yaml +++ /dev/null @@ -1,100 +0,0 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: up-img-admin-tls -status: - readyReplicas: 3 ---- -apiVersion: v1 -kind: Pod -metadata: - name: up-img-admin-tls-0 -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: v1 -kind: Pod -metadata: - name: up-img-admin-tls-1 -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: v1 -kind: Pod -metadata: - name: up-img-admin-tls-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: - - command: ../../../hack/get-redpanda-info.sh ---- -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-tls -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-no-client-auth/06-disable-cloud-storage.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/06-disable-cloud-storage.yaml deleted file mode 100644 index 1ee59bcce..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/06-disable-cloud-storage.yaml +++ /dev/null @@ -1,7 +0,0 @@ -apiVersion: redpanda.vectorized.io/v1alpha1 -kind: Cluster -metadata: - name: up-img-admin-tls -spec: - cloudStorage: - enabled: false diff --git a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/07-assert.yaml b/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/07-assert.yaml deleted file mode 100644 index e2c6efb5d..000000000 --- a/src/go/k8s/tests/e2e/update-image-tls-no-client-auth/07-assert.yaml +++ /dev/null @@ -1,4 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestAssert -collectors: - - command: ../../../hack/get-redpanda-info.sh diff --git a/taskfiles/k8s.yml b/taskfiles/k8s.yml index 5b8642093..efeaebd29 100644 --- a/taskfiles/k8s.yml +++ b/taskfiles/k8s.yml @@ -60,21 +60,6 @@ tasks: --load ./dist - fetch-latest-nightly-redpanda: - desc: fetch the latest redpanda nightly build and tag it localhost/redpanda:dev - summary: | - pulls down the latest redpanda nightly build and tag it localhost/repdanda:dev - to allow us to skip building redpanda with every CI run. - dir: src/go/k8s - deps: - - :dev:install-docker-tag-list - cmds: - - task: fetch-latest-redpanda - vars: - CONSTRAINT: '~0.0.0-0' - REPO: 'docker.redpanda.com/redpandadata/redpanda-nightly' - - fetch-latest-redpanda: desc: fetch the latest redpanda release and tag it localhost/redpanda:dev summary: | @@ -140,7 +125,6 @@ tasks: - task: set-aio-max vars: USE_SUDO: "false" - - build-operator-images - task: set-inotify-watches vars: USE_SUDO: "false"