From 3c296f348219b6b3759a2badf7185eb89651b782 Mon Sep 17 00:00:00 2001 From: nolancon Date: Fri, 24 Jun 2022 11:28:58 +0000 Subject: [PATCH 1/2] Use develop etcd-operator image in tests --- e2e/tests/stable/portal/00-install-full.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/e2e/tests/stable/portal/00-install-full.yaml b/e2e/tests/stable/portal/00-install-full.yaml index e87b2964..7035432e 100644 --- a/e2e/tests/stable/portal/00-install-full.yaml +++ b/e2e/tests/stable/portal/00-install-full.yaml @@ -1,4 +1,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - - command: kubectl storageos install --include-etcd --enable-portal-manager --portal-client-id=${CLIENT_ID} --portal-secret=${PASSWORD} --portal-api-url=${URL} --portal-tenant-id=${TENANT_ID} --stos-version=develop + - command: kubectl storageos install --include-etcd --enable-portal-manager --portal-client-id=${CLIENT_ID} --portal-secret=${PASSWORD} --portal-api-url=${URL} --portal-tenant-id=${TENANT_ID} --stos-version=develop --etcd-operator-version=develop From 9c6570abd5cc3271156e27683bd7ff7a2ac32597 Mon Sep 17 00:00:00 2001 From: nolancon Date: Fri, 24 Jun 2022 11:43:34 +0000 Subject: [PATCH 2/2] Set to one etcd-replica for e2e --- e2e/tests/stable/portal/00-assert.yaml | 16 ---------------- e2e/tests/stable/portal/00-install-full.yaml | 2 +- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/e2e/tests/stable/portal/00-assert.yaml b/e2e/tests/stable/portal/00-assert.yaml index 27ad5843..22613c60 100644 --- a/e2e/tests/stable/portal/00-assert.yaml +++ b/e2e/tests/stable/portal/00-assert.yaml @@ -26,22 +26,6 @@ metadata: status: readyReplicas: 1 --- -apiVersion: apps/v1 -kind: ReplicaSet -metadata: - name: storageos-etcd-1 - namespace: storageos-etcd -status: - readyReplicas: 1 ---- -apiVersion: apps/v1 -kind: ReplicaSet -metadata: - name: storageos-etcd-2 - namespace: storageos-etcd -status: - readyReplicas: 1 ---- apiVersion: admissionregistration.k8s.io/v1 kind: MutatingWebhookConfiguration metadata: diff --git a/e2e/tests/stable/portal/00-install-full.yaml b/e2e/tests/stable/portal/00-install-full.yaml index 7035432e..dbdd8ea5 100644 --- a/e2e/tests/stable/portal/00-install-full.yaml +++ b/e2e/tests/stable/portal/00-install-full.yaml @@ -1,4 +1,4 @@ apiVersion: kuttl.dev/v1beta1 kind: TestStep commands: - - command: kubectl storageos install --include-etcd --enable-portal-manager --portal-client-id=${CLIENT_ID} --portal-secret=${PASSWORD} --portal-api-url=${URL} --portal-tenant-id=${TENANT_ID} --stos-version=develop --etcd-operator-version=develop + - command: kubectl storageos install --include-etcd --enable-portal-manager --portal-client-id=${CLIENT_ID} --portal-secret=${PASSWORD} --portal-api-url=${URL} --portal-tenant-id=${TENANT_ID} --stos-version=develop --etcd-operator-version=develop --etcd-replicas=1