File tree Expand file tree Collapse file tree 7 files changed +27
-33
lines changed Expand file tree Collapse file tree 7 files changed +27
-33
lines changed Original file line number Diff line number Diff line change @@ -130,29 +130,3 @@ apiVersion: v1
130130kind : ConfigMap
131131metadata :
132132 name : openstack-config-data
133- ---
134- apiVersion : kuttl.dev/v1beta1
135- kind : TestAssert
136- commands :
137- - script : |
138- # when using image digests the containerImage URLs are SHA's so we verify them with a script
139- tupleTemplate='{{ range (index .spec.template.spec.containers 1).env }}{{ .name }}{{ "#" }}{{ .value}}{{"\n"}}{{ end }}'
140- imageTuples=$(oc get -n openstack-operators deployment mariadb-operator-controller-manager -o go-template="$tupleTemplate")
141- # format of imageTuple is: RELATED_IMAGE_MARIADB_<service>#<image URL with SHA> separated by newlines
142- for ITEM in $(echo $imageTuples); do
143- # it is an image
144- if echo $ITEM | grep 'RELATED_IMAGE' &> /dev/null; then
145- NAME=$(echo $ITEM | sed -e 's|^RELATED_IMAGE_MARIADB_\([^_]*\)_.*|\1|')
146- IMG_FROM_ENV=$(echo $ITEM | sed -e 's|^.*#\(.*\)|\1|')
147- template='{{ (index .spec.template.spec.containers 0).image }}'
148- case $NAME in
149- IMAGE)
150- STATEFUL_SET_IMG=$(oc get -n $NAMESPACE statefulset openstack-galera -o go-template="$template")
151- ;;
152- esac
153- if [ "$STATEFUL_SET_IMG" != "$IMG_FROM_ENV" ]; then
154- echo "$NAME image does not equal $VALUE"
155- exit 1
156- fi
157- fi
158- done
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ kind: TestAssert
44commands :
55 - script : |
66 set -e
7- ${MARIADB_KUTTL_DIR:-tests/kuttl/tests} /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1
7+ .. /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1
88 # ensure db users are configured without TLS connection restriction
99 oc rsh -n ${NAMESPACE} -c galera openstack-galera-0 /bin/sh -c 'mysql -uroot -p${DB_ROOT_PASSWORD} -e "show grants for \`someuser\`@\`%\`;"' | grep 'GRANT USAGE' | grep -v 'REQUIRE SSL'
1010 ---
Original file line number Diff line number Diff line change @@ -3,4 +3,4 @@ apiVersion: kuttl.dev/v1beta1
33kind : TestAssert
44commands :
55 - script : |
6- ${MARIADB_KUTTL_DIR:-tests/kuttl/tests} /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1 --reverse
6+ .. /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_accounttest someuser dbsecret1 --reverse
Original file line number Diff line number Diff line change @@ -13,8 +13,8 @@ commands:
1313 # for legacy secret non-present, test that a mariadb username was *not* made
1414 - script : |
1515 set -euxo pipefail
16- ${MARIADB_KUTTL_DIR:-tests/kuttl/tests} /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_utf8 kuttldb_utf_8 12345678 --reverse
16+ .. /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_utf8 kuttldb_utf_8 12345678 --reverse
1717 # for legacy secret present, test that a mariadb username was made
1818 - script : |
1919 set -euxo pipefail
20- ${MARIADB_KUTTL_DIR:-tests/kuttl/tests} /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_legacy_secret kuttldb_legacy_secret dbsecret1
20+ .. /../common/scripts/check_db_account.sh openstack-galera-0 kuttldb_legacy_secret kuttldb_legacy_secret dbsecret1
Original file line number Diff line number Diff line change 1+ apiVersion : kuttl.dev/v1beta1
2+ kind : TestStep
3+ delete :
4+ - apiVersion : mariadb.openstack.org/v1beta1
5+ kind : Galera
6+ name : openstack
7+ - apiVersion : v1
8+ kind : Secret
9+ name : kuttl-galera-tls
10+ commands :
11+ - script : |
12+ oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
13+ for i in `oc get pv | awk '/mysql-db.*galera/ {print $1}'`; do oc patch pv $i -p '{"spec":{"claimRef": null}}'; done
Original file line number Diff line number Diff line change 77 - apiVersion : v1
88 kind : Secret
99 name : kuttl-galera-tls
10- - apiVersion : v1
11- kind : Secret
12- name : kuttldb-secret
1310commands :
1411 - script : |
1512 oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
Original file line number Diff line number Diff line change 1+ apiVersion : kuttl.dev/v1beta1
2+ kind : TestStep
3+ delete :
4+ - apiVersion : mariadb.openstack.org/v1beta1
5+ kind : Galera
6+ name : openstack
7+ commands :
8+ - script : |
9+ oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2
10+ for i in `oc get pv | awk '/mysql-db.*galera/ {print $1}'`; do oc patch pv $i -p '{"spec":{"claimRef": null}}'; done
You can’t perform that action at this time.
0 commit comments