From 3b1359af5f522b10bf1de1733cd8a2111dfbdacb Mon Sep 17 00:00:00 2001 From: Mauricio Harley Date: Tue, 14 Nov 2023 08:11:55 -0500 Subject: [PATCH] Including KUTTL tests --- config/samples/barbican_v1beta1_barbican.yaml | 1 - kuttl-test.yaml | 4 +- .../common/assert_sample_deployment.yaml | 94 ++++++------------- .../{00-assert.yaml => 01-assert.yaml} | 0 ...-barbican.yaml => 01-deploy-barbican.yaml} | 0 .../kuttl/tests/barbican_scale/02-assert.yaml | 49 ++++++++++ .../barbican_scale/02-scale-barbican.yaml | 7 ++ .../kuttl/tests/barbican_scale/03-assert.yaml | 49 ++++++++++ .../03-scale-down-barbican.yaml | 7 ++ .../kuttl/tests/barbican_scale/04-assert.yaml | 40 ++++++++ .../04-scale-down-zero-barbican.yaml | 7 ++ .../deploy/barbican_v1beta1_barbican.yaml | 68 -------------- .../common/assert-sample-deployment.yaml | 66 ------------- .../01-assert-deploy-barbican.yaml | 1 - .../basic-deployment/01-deploy-barbican.yaml | 5 - 15 files changed, 190 insertions(+), 208 deletions(-) rename test/kuttl/tests/barbican_scale/{00-assert.yaml => 01-assert.yaml} (100%) rename test/kuttl/tests/barbican_scale/{00-deploy-barbican.yaml => 01-deploy-barbican.yaml} (100%) create mode 100644 test/kuttl/tests/barbican_scale/02-assert.yaml create mode 100644 test/kuttl/tests/barbican_scale/02-scale-barbican.yaml create mode 100644 test/kuttl/tests/barbican_scale/03-assert.yaml create mode 100644 test/kuttl/tests/barbican_scale/03-scale-down-barbican.yaml create mode 100644 test/kuttl/tests/barbican_scale/04-assert.yaml create mode 100644 test/kuttl/tests/barbican_scale/04-scale-down-zero-barbican.yaml delete mode 100644 test/kuttl/tests/barbican_scale/deploy/barbican_v1beta1_barbican.yaml delete mode 100644 tests/kuttl/common/assert-sample-deployment.yaml delete mode 120000 tests/kuttl/tests/basic-deployment/01-assert-deploy-barbican.yaml delete mode 100644 tests/kuttl/tests/basic-deployment/01-deploy-barbican.yaml diff --git a/config/samples/barbican_v1beta1_barbican.yaml b/config/samples/barbican_v1beta1_barbican.yaml index 78daa91e..433da7c8 100644 --- a/config/samples/barbican_v1beta1_barbican.yaml +++ b/config/samples/barbican_v1beta1_barbican.yaml @@ -54,7 +54,6 @@ spec: optional_policy.json: | {"some": "custom policy"} barbicanKeystoneListener: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified nodeSelector: optional_override: here customServiceConfig: | diff --git a/kuttl-test.yaml b/kuttl-test.yaml index 3b60eb07..7f97fbd7 100644 --- a/kuttl-test.yaml +++ b/kuttl-test.yaml @@ -1,7 +1,7 @@ # # EXECUTION (from install_yamls repo root): # -# make cinder_kuttl +# make barbican_kuttl # # ASSUMPTIONS: # @@ -18,7 +18,7 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite reportFormat: JSON reportName: kuttl-test-barbican -namespace: barbican-kuttl-tests +namespace: barbican-kuttl-tests timeout: 180 parallel: 1 suppress: diff --git a/test/kuttl/common/assert_sample_deployment.yaml b/test/kuttl/common/assert_sample_deployment.yaml index c99b1bb4..ad44acbf 100644 --- a/test/kuttl/common/assert_sample_deployment.yaml +++ b/test/kuttl/common/assert_sample_deployment.yaml @@ -20,68 +20,32 @@ spec: apiVersion: apps/v1 kind: Deployment metadata: - labels: - app.kubernetes.io/name: barbican - app.kubernetes.io/instance: barbican - app.kubernetes.io/part-of: barbican-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: barbican-operator - name: barbican -spec: - serviceAccount: barbican - serviceUser: barbican - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified - databaseInstance: openstack - databaseUser: barbican - rabbitMqCusterName: barbican_rabbit - secret: osp-secret - passwordSelectors: - database: BarbicanDatabasePassword - service: BarbicanPassword - debug: - dbInitContainer: false - dbSync: false - initContainer: false - service: false - preserveJobs: true - nodeSelector: - node: controller - customServiceConfig: | - [DEFAULT] - debug = True - defaultConfigOverwrite: - policy.json: | - {"some": "custom policy"} - barbicanAPI: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - passwordSelectors: - database: BarbicanDatabasePassword - service: BarbicanPassword - barbicanWorker: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - barbicanKeystoneListener: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} + name: barbican-api-api + ownerReferences: + - apiVersion: barbican.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true + kind: BarbicanAPI + name: barbican-api +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-keystone-listener-keystone-listener + ownerReferences: + - apiVersion: barbican.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true + kind: BarbicanKeystoneListener + name: barbican-keystone-listener +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-worker-worker + ownerReferences: + - apiVersion: barbican.openstack.org/v1beta1 + blockOwnerDeletion: true + controller: true + kind: BarbicanWorker + name: barbican-worker diff --git a/test/kuttl/tests/barbican_scale/00-assert.yaml b/test/kuttl/tests/barbican_scale/01-assert.yaml similarity index 100% rename from test/kuttl/tests/barbican_scale/00-assert.yaml rename to test/kuttl/tests/barbican_scale/01-assert.yaml diff --git a/test/kuttl/tests/barbican_scale/00-deploy-barbican.yaml b/test/kuttl/tests/barbican_scale/01-deploy-barbican.yaml similarity index 100% rename from test/kuttl/tests/barbican_scale/00-deploy-barbican.yaml rename to test/kuttl/tests/barbican_scale/01-deploy-barbican.yaml diff --git a/test/kuttl/tests/barbican_scale/02-assert.yaml b/test/kuttl/tests/barbican_scale/02-assert.yaml new file mode 100644 index 00000000..72108fd2 --- /dev/null +++ b/test/kuttl/tests/barbican_scale/02-assert.yaml @@ -0,0 +1,49 @@ +# +# Check for: +# - Barbican CRs with 2 replicas for each one +# - BarbicanAPI barbican-api Deployment with 2 replicas +# - BarbicanKeystoneListener barbican-keystone-listener Deployment with 2 replicas +# - BarbicanWorker barbican-worker Deployment with 2 replicas + + +apiVersion: barbican.openstack.org/v1beta1 +kind: Barbican +metadata: + name: barbican +spec: + barbicanAPI: + replicas: 2 + barbicanKeystoneListener: + replicas: 2 + barbicanWorker: + replicas: 2 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-api-api +spec: + replicas: 2 +status: + availableReplicas: 2 + replicas: 2 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-keystone-listener-keystone-listener +spec: + replicas: 2 +status: + availableReplicas: 2 + replicas: 2 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-worker-worker +spec: + replicas: 2 +status: + availableReplicas: 2 + replicas: 2 diff --git a/test/kuttl/tests/barbican_scale/02-scale-barbican.yaml b/test/kuttl/tests/barbican_scale/02-scale-barbican.yaml new file mode 100644 index 00000000..5297c658 --- /dev/null +++ b/test/kuttl/tests/barbican_scale/02-scale-barbican.yaml @@ -0,0 +1,7 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: | + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanAPI/replicas", "value":2}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanKeystoneListener/replicas", "value":2}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanWorker/replicas", "value":2}]' diff --git a/test/kuttl/tests/barbican_scale/03-assert.yaml b/test/kuttl/tests/barbican_scale/03-assert.yaml new file mode 100644 index 00000000..b1ddd67a --- /dev/null +++ b/test/kuttl/tests/barbican_scale/03-assert.yaml @@ -0,0 +1,49 @@ +# +# Check for: +# - Barbican CRs with12 replicas for each one +# - BarbicanAPI barbican-api Deployment with 1 replica +# - BarbicanKeystoneListener barbican-keystone-listener Deployment with 1 replica +# - BarbicanWorker barbican-worker Deployment with 1 replica + + +apiVersion: barbican.openstack.org/v1beta1 +kind: Barbican +metadata: + name: barbican +spec: + barbicanAPI: + replicas: 1 + barbicanKeystoneListener: + replicas: 1 + barbicanWorker: + replicas: 1 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-api-api +spec: + replicas: 1 +status: + availableReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-keystone-listener-keystone-listener +spec: + replicas: 1 +status: + availableReplicas: 1 + replicas: 1 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-worker-worker +spec: + replicas: 1 +status: + availableReplicas: 1 + replicas: 1 diff --git a/test/kuttl/tests/barbican_scale/03-scale-down-barbican.yaml b/test/kuttl/tests/barbican_scale/03-scale-down-barbican.yaml new file mode 100644 index 00000000..92715c22 --- /dev/null +++ b/test/kuttl/tests/barbican_scale/03-scale-down-barbican.yaml @@ -0,0 +1,7 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: | + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanAPI/replicas", "value":1}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanKeystoneListener/replicas", "value":1}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanWorker/replicas", "value":1}]' diff --git a/test/kuttl/tests/barbican_scale/04-assert.yaml b/test/kuttl/tests/barbican_scale/04-assert.yaml new file mode 100644 index 00000000..06aa8976 --- /dev/null +++ b/test/kuttl/tests/barbican_scale/04-assert.yaml @@ -0,0 +1,40 @@ +# +# Check for: +# - Barbican CRs with 0 replicas for each one +# - BarbicanAPI barbican-api Deployment with 0 replicas +# - BarbicanKeystoneListener barbican-keystone-listener Deployment with 0 replicas +# - BarbicanWorker barbican-worker Deployment with 0 replicas + + +apiVersion: barbican.openstack.org/v1beta1 +kind: Barbican +metadata: + name: barbican +spec: + barbicanAPI: + replicas: 0 + barbicanKeystoneListener: + replicas: 0 + barbicanWorker: + replicas: 0 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-api-api +spec: + replicas: 0 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-keystone-listener-keystone-listener +spec: + replicas: 0 +--- +apiVersion: apps/v1 +kind: Deployment +metadata: + name: barbican-worker-worker +spec: + replicas: 0 diff --git a/test/kuttl/tests/barbican_scale/04-scale-down-zero-barbican.yaml b/test/kuttl/tests/barbican_scale/04-scale-down-zero-barbican.yaml new file mode 100644 index 00000000..6377712e --- /dev/null +++ b/test/kuttl/tests/barbican_scale/04-scale-down-zero-barbican.yaml @@ -0,0 +1,7 @@ +apiVersion: kuttl.dev/v1beta1 +kind: TestStep +commands: + - script: | + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanAPI/replicas", "value":0}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanKeystoneListener/replicas", "value":0}]' + oc patch Barbican -n $NAMESPACE barbican --type='json' -p='[{"op": "replace", "path": "/spec/barbicanWorker/replicas", "value":0}]' diff --git a/test/kuttl/tests/barbican_scale/deploy/barbican_v1beta1_barbican.yaml b/test/kuttl/tests/barbican_scale/deploy/barbican_v1beta1_barbican.yaml deleted file mode 100644 index afcf71fd..00000000 --- a/test/kuttl/tests/barbican_scale/deploy/barbican_v1beta1_barbican.yaml +++ /dev/null @@ -1,68 +0,0 @@ -apiVersion: barbican.openstack.org/v1beta1 -kind: Barbican -metadata: - labels: - app.kubernetes.io/name: barbican - app.kubernetes.io/instance: barbican - app.kubernetes.io/part-of: barbican-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: barbican-operator - name: barbican -spec: - serviceAccount: barbican - serviceUser: barbican - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified - databaseInstance: openstack - databaseUser: barbican - rabbitMqCusterName: barbican_rabbit - secret: osp-secret - passwordSelectors: - database: BarbicanDatabasePassword - service: BarbicanPassword - debug: - dbInitContainer: false - dbSync: false - initContainer: false - service: false - preserveJobs: true - nodeSelector: - node: controller - customServiceConfig: | - [DEFAULT] - debug = True - defaultConfigOverwrite: - policy.json: | - {"some": "custom policy"} - barbicanAPI: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - passwordSelectors: - database: BarbicanDatabasePassword - service: BarbicanPassword - barbicanWorker: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - barbicanKeystoneListener: - containerImage: quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified - nodeSelector: - optional_override: here - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} diff --git a/tests/kuttl/common/assert-sample-deployment.yaml b/tests/kuttl/common/assert-sample-deployment.yaml deleted file mode 100644 index d7c9c1ca..00000000 --- a/tests/kuttl/common/assert-sample-deployment.yaml +++ /dev/null @@ -1,66 +0,0 @@ -apiVersion: barbican.openstack.org/v1beta1 -kind: Barbican -metadata: - labels: - app.kubernetes.io/name: barbican - app.kubernetes.io/instance: barbican-sample - app.kubernetes.io/part-of: barbican-operator - app.kubernetes.io/managed-by: kustomize - app.kubernetes.io/created-by: barbican-operator - name: barbican-sample -spec: - serviceUser: barbican - databaseInstance: some_string - databaseUser: barbican - rabbitMqCusterName: barbican_rabbit - secret: barbican-secret - passwordSelectors: - database: BarbicanDatabasePassword - service: BarbicanPassword - debug: - dbInitContainer: true - dbSync: true - initContainer: true - service: true - preserveJobs: true - nodeSelector: - node: controller - customServiceConfig: | - [DEFAULT] - debug = True - defaultConfigOverwrite: - policy.json: | - {"some": "custom policy"} - barbicanAPI: - containerImage: some_image - nodeSelector: - optional_override: here - replicas: 10 - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - networkAttachments: - - internal - externalEndpoints: - - endpoint: - ipAddressPool: some_ip_string - sharedIP: true - sharedIPKey: some_key_string - loadBalancerIPs: - - some_ip_string - barbicanWorker: - containerImage: some_image - nodeSelector: - optional_override: here - replicas: 10 - customServiceConfig: | - [optional] - overrides = True - defautlConfigOverwrite: - optional_policy.json: | - {"some": "custom policy"} - networkAttachments: - - internal diff --git a/tests/kuttl/tests/basic-deployment/01-assert-deploy-barbican.yaml b/tests/kuttl/tests/basic-deployment/01-assert-deploy-barbican.yaml deleted file mode 120000 index 762a8cf3..00000000 --- a/tests/kuttl/tests/basic-deployment/01-assert-deploy-barbican.yaml +++ /dev/null @@ -1 +0,0 @@ -../../common/assert-sample-deployment.yaml \ No newline at end of file diff --git a/tests/kuttl/tests/basic-deployment/01-deploy-barbican.yaml b/tests/kuttl/tests/basic-deployment/01-deploy-barbican.yaml deleted file mode 100644 index 3202c064..00000000 --- a/tests/kuttl/tests/basic-deployment/01-deploy-barbican.yaml +++ /dev/null @@ -1,5 +0,0 @@ -apiVersion: kuttl.dev/v1beta1 -kind: TestStep -commands: - - script: | - oc apply -n $NAMESPACE -f ../../../../config/samples/barbican_v1beta1_barbican.yaml