Rename watcher appcred in kuttl test to avoid automatic deletion

In the kuttl tests, we are creating appcred and watcher out of the
openstackcontrolplane. The openstack-operator has logic to delete the
appcred ac-watcher if watcher is disabled in the openstackcontrolplane.

In order to be able to execute the kuttl tests properly, I'm renaming
the appcred to ac-watcher-test.

Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

Author: amoralej

test/kuttl/test-suites/default/appcred-tests/02-assert.yaml

@@ -6,18 +6,18 @@ commands:
       set -euo pipefail
       NS="${NAMESPACE}"
 
-      echo "Waiting for KeystoneApplicationCredential ac-watcher to be Ready..."
-      oc wait -n "${NS}" appcred/ac-watcher --for=condition=Ready --timeout=300s
+      echo "Waiting for KeystoneApplicationCredential ac-watcher-test to be Ready..."
+      oc wait -n "${NS}" appcred/ac-watcher-test --for=condition=Ready --timeout=300s
 
-      ac_id=$(oc get -n "${NS}" appcred/ac-watcher -o jsonpath='{.status.acID}')
+      ac_id=$(oc get -n "${NS}" appcred/ac-watcher-test -o jsonpath='{.status.acID}')
       if [ -z "${ac_id}" ]; then
         echo "ERROR: appcred/ac-watcher.status.acID is empty"
         exit 1
       fi
       echo "ac-watcher.status.acID=${ac_id}"
 
-      oc get -n "${NS}" secret/ac-watcher-secret >/dev/null
-      secret_ac_id=$(oc get -n "${NS}" secret/ac-watcher-secret -o jsonpath='{.data.AC_ID}' | base64 -d)
+      oc get -n "${NS}" secret/ac-watcher-test-secret >/dev/null
+      secret_ac_id=$(oc get -n "${NS}" secret/ac-watcher-test-secret -o jsonpath='{.data.AC_ID}' | base64 -d)
       if [ "${secret_ac_id}" != "${ac_id}" ]; then
         echo "ERROR: Secret AC_ID (${secret_ac_id}) != appcred.status.acID (${ac_id})"
         exit 1

test/kuttl/test-suites/default/appcred-tests/02-deploy-appcred.yaml

@@ -18,7 +18,7 @@ commands:
       apiVersion: keystone.openstack.org/v1beta1
       kind: KeystoneApplicationCredential
       metadata:
-        name: ac-watcher
+        name: ac-watcher-test
       spec:
         secret: osp-secret
         passwordSelector: WatcherPassword
@@ -29,4 +29,4 @@ commands:
         unrestricted: false
       EOF
 
-      oc patch watcher watcher-kuttl -n "${NS}" --type=merge -p '{"spec":{"auth":{"applicationCredentialSecret":"ac-watcher-secret"}}}'
+      oc patch watcher watcher-kuttl -n "${NS}" --type=merge -p '{"spec":{"auth":{"applicationCredentialSecret":"ac-watcher-test-secret"}}}'

test/kuttl/test-suites/default/appcred-tests/03-assert.yaml

@@ -14,13 +14,13 @@ commands:
 
       echo "Waiting for ac-watcher.status.acID to change..."
       for _ in $(seq 1 60); do
-        ac_id=$(oc get -n "${NS}" appcred/ac-watcher -o jsonpath='{.status.acID}')
+        ac_id=$(oc get -n "${NS}" appcred/ac-watcher-test -o jsonpath='{.status.acID}')
         if [ -n "${ac_id}" ] && [ "${ac_id}" != "${prev_acid}" ]; then
           break
         fi
         sleep 5
       done
-      ac_id=$(oc get -n "${NS}" appcred/ac-watcher -o jsonpath='{.status.acID}')
+      ac_id=$(oc get -n "${NS}" appcred/ac-watcher-test -o jsonpath='{.status.acID}')
       if [ -z "${ac_id}" ] || [ "${ac_id}" = "${prev_acid}" ]; then
         echo "ERROR: ACID did not change after forcing rotation"
         echo "  prev=${prev_acid}"
@@ -29,7 +29,7 @@ commands:
       fi
       echo "✓ ACID rotated: ${prev_acid} -> ${ac_id}"
 
-      secret_ac_id=$(oc get -n "${NS}" secret/ac-watcher-secret -o jsonpath='{.data.AC_ID}' | base64 -d)
+      secret_ac_id=$(oc get -n "${NS}" secret/ac-watcher-test-secret -o jsonpath='{.data.AC_ID}' | base64 -d)
       if [ "${secret_ac_id}" != "${ac_id}" ]; then
         echo "ERROR: Secret AC_ID (${secret_ac_id}) != rotated appcred.status.acID (${ac_id})"
         exit 1

test/kuttl/test-suites/default/appcred-tests/03-rotate-appcred.yaml

@@ -8,7 +8,7 @@ commands:
       old_api_uid=$(oc get pod -n "${NS}" watcher-kuttl-api-0 -o jsonpath='{.metadata.uid}')
       old_applier_uid=$(oc get pod -n "${NS}" watcher-kuttl-applier-0 -o jsonpath='{.metadata.uid}')
       old_de_uid=$(oc get pod -n "${NS}" watcher-kuttl-decision-engine-0 -o jsonpath='{.metadata.uid}')
-      old_acid=$(oc get -n "${NS}" appcred/ac-watcher -o jsonpath='{.status.acID}')
+      old_acid=$(oc get -n "${NS}" appcred/ac-watcher-test -o jsonpath='{.status.acID}')
 
       oc create configmap appcred-watcher-rotate-pre \
         --from-literal=api_uid="${old_api_uid}" \
@@ -17,5 +17,5 @@ commands:
         --from-literal=ac_id="${old_acid}" \
         --dry-run=client -o yaml | oc apply -n "${NS}" -f -
 
-      oc patch -n "${NS}" keystoneapplicationcredential ac-watcher --type=merge --subresource=status \
+      oc patch -n "${NS}" keystoneapplicationcredential ac-watcher-test --type=merge --subresource=status \
         -p '{"status":{"expiresAt":"2001-05-19T00:00:00Z"}}'

test/kuttl/test-suites/default/appcred-tests/04-cleanup.yaml

@@ -3,11 +3,11 @@ kind: TestStep
 delete:
   - apiVersion: keystone.openstack.org/v1beta1
     kind: KeystoneApplicationCredential
-    name: ac-watcher
+    name: ac-watcher-test
     namespace: watcher-kuttl-default
   - apiVersion: v1
     kind: Secret
-    name: ac-watcher-secret
+    name: ac-watcher-test-secret
     namespace: watcher-kuttl-default
   - apiVersion: watcher.openstack.org/v1beta1
     kind: Watcher