Merge pull request #153 from cescgina/kuttl_change_config

Add kuttl tests to check keystone config changes

api/bases/keystone.openstack.org_keystoneapis.yaml

@@ -105,9 +105,9 @@ spec:
                 additionalProperties:
                   type: string
                 description: 'ConfigOverwrite - interface to overwrite default config
-                  files like e.g. logging.conf or policy.json. But can also be used
-                  to add additional files. Those get added to the service config dir
-                  in /etc/<service> . TODO: -> implement'
+                  files like e.g. policy.json. But can also be used to add additional
+                  files. Those get added to the service config dir in /etc/<service>
+                  . TODO: -> implement'
                 type: object
               externalEndpoints:
                 description: ExternalEndpoints, expose a VIP using a pre-created IPAddressPool

config/crd/bases/keystone.openstack.org_keystoneapis.yaml

@@ -106,8 +106,8 @@ spec:
                   type: string
                 description: 'ConfigOverwrite - interface to overwrite default config
                   files like e.g. policy.json. But can also be used to add additional
-                  files. Those get added to the service config dir in /etc/<service>.
-                  TODO: -> implement'
+                  files. Those get added to the service config dir in /etc/<service>
+                  . TODO: -> implement'
                 type: object
               externalEndpoints:
                 description: ExternalEndpoints, expose a VIP using a pre-created IPAddressPool

tests/kuttl/common/cleanup-keystone.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      PWD=$INSTALL_YAMLS
+      make -C $INSTALL_YAMLS keystone_deploy_cleanup

tests/kuttl/common/deploy_keystone.yaml

@@ -0,0 +1,6 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      PWD=$INSTALL_YAMLS
+      make -C $INSTALL_YAMLS keystone_deploy

tests/kuttl/common/errors_cleanup_keystone.yaml

@@ -0,0 +1,58 @@
+#
+# Check for:
+#
+# No KeystoneAPI CR
+# No Deployment for KeystoneAPI CR
+# No Pods in keystone Deployment
+# No Keystone Services
+# No Keystone Routes
+#
+apiVersion: keystone.openstack.org/v1beta1
+kind: KeystoneAPI
+metadata:
+  finalizers:
+  - KeystoneAPI
+  name: keystone
+  namespace: openstack
+---
+apiVersion: apps/v1
+kind: Deployment
+metadata:
+  name: keystone
+  namespace: openstack
+---
+# the openshift annotations can't be checked through the deployment above
+apiVersion: v1
+kind: Pod
+metadata:
+  annotations:
+    openshift.io/scc: anyuid
+  labels:
+    service: keystone
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    internal: "true"
+    service: keystone
+  name: keystone-internal
+  namespace: openstack
+---
+apiVersion: v1
+kind: Service
+metadata:
+  labels:
+    public: "true"
+    service: keystone
+  name: keystone-public
+  namespace: openstack
+---
+apiVersion: route.openshift.io/v1
+kind: Route
+metadata:
+  name: keystone-public
+  labels:
+    public: "true"
+    service: keystone
+  namespace: openstack

tests/kuttl/common/scripts/check_debug_in_keystone_pod_logs.sh

@@ -0,0 +1,20 @@
+#!/bin/sh
+#
+found=0
+not_found=1
+if [ "$1" == "--reverse" ];then
+    # sometimes we want to check that there is no DEBUG logs
+    found=1
+    not_found=0
+fi
+
+pod=$(oc get pods -n openstack -l service=keystone -o name)
+# in the case the logs have DEBUG lines, keep only one to avoid cluttering the
+# test output
+debug=$(oc logs -n openstack "$pod" | grep "DEBUG" | head -n 1)
+
+if [ -n "$debug" ]; then
+    exit $found
+else
+    exit $not_found
+fi

tests/kuttl/tests/change_keystone_config/01-assert.yaml

@@ -0,0 +1 @@
+../../common/assert_sample_deployment.yaml

tests/kuttl/tests/change_keystone_config/01-deploy-keystone.yaml

@@ -0,0 +1 @@
+../../common/deploy_keystone.yaml

tests/kuttl/tests/change_keystone_config/02-assert.yaml

@@ -0,0 +1,6 @@
+# check that by default, debug is not set in keystone config
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+namespaced: true
+commands:
+  - script: $KEYSTONE_KUTTL_DIR/../common/scripts/check_debug_in_keystone_pod_logs.sh

tests/kuttl/tests/change_keystone_config/03-assert.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestAssert
+namespaced: true
+commands:
+  - script: $KEYSTONE_KUTTL_DIR/../common/scripts/check_debug_in_keystone_pod_logs.sh --reverse

tests/kuttl/tests/change_keystone_config/03-change_keystone_config.yaml

@@ -0,0 +1,5 @@
+apiVersion: kuttl.dev/v1beta1
+kind: TestStep
+commands:
+  - script: |
+      oc patch keystoneapi -n openstack keystone --type='json' -p='[{"op": "replace", "path": "/spec/customServiceConfig", "value": "[DEFAULT]\ndebug = false"}]'

tests/kuttl/tests/keystone_scale/01-deploy-keystone.yaml

@@ -0,0 +1 @@
+../../common/deploy_keystone.yaml

tests/kuttl/tests/keystone_scale/05-cleanup-keystone.yaml

@@ -0,0 +1 @@
+../../common/cleanup-keystone.yaml

tests/kuttl/tests/keystone_scale/05-errors.yaml

@@ -0,0 +1 @@
+../../common/errors_cleanup_keystone.yaml