Skip to content

Commit 247fc1a

Browse files
Merge pull request #130 from kajinamit/kuttl-secret
Use pre-created osp-secret in kuttl tests
2 parents 41536ba + 828e786 commit 247fc1a

14 files changed

Lines changed: 15 additions & 59 deletions

config/samples/mariadb_v1beta1_galera.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Galera
33
metadata:
44
name: openstack
55
spec:
6-
secret: mariadb-secret
6+
secret: osp-secret
77
storageClass: local-storage
88
storageRequest: 500M
99
replicas: 3

config/samples/mariadb_v1beta1_galera_custom_config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: Galera
33
metadata:
44
name: openstack
55
spec:
6-
secret: mariadb-secret
6+
secret: osp-secret
77
storageClass: local-storage
88
storageRequest: 500M
99
replicas: 3

config/samples/mariadb_v1beta1_mariadb.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ kind: MariaDB
33
metadata:
44
name: openstack
55
spec:
6-
secret: mariadb-secret
6+
secret: osp-secret
77
storageClass: local-storage
88
storageRequest: 500M

config/samples/secret.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.

kuttl-test.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ apiVersion: kuttl.dev/v1beta1
1818
kind: TestSuite
1919
reportFormat: JSON
2020
reportName: kuttl-test-mariadb
21+
namespace: mariadb-kuttl-tests
2122
timeout: 180
2223
parallel: 2
2324
suppress:

tests/kuttl/common/create_secret.yaml

Lines changed: 0 additions & 7 deletions
This file was deleted.

tests/kuttl/tests/galera_deploy/00-create-secret.yaml

Lines changed: 0 additions & 1 deletion
This file was deleted.

tests/kuttl/tests/galera_deploy/01-deploy_galera.yaml

Lines changed: 0 additions & 6 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../config/samples/mariadb_v1beta1_galera.yaml
Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
1-
apiVersion: kuttl.dev/v1beta1
1+
apiVersion: kuttl.dev/v1beta
22
kind: TestStep
3+
delete:
4+
- apiVersion: mariadb.openstack.org/v1beta1
5+
kind: Galera
6+
name: openstack
37
commands:
48
- script: |
5-
oc kustomize deploy | oc delete -n $NAMESPACE -f -
6-
rm deploy/mariadb_v1beta1_galera.yaml
79
oc delete -n $NAMESPACE pvc mysql-db-openstack-galera-0 mysql-db-openstack-galera-1 mysql-db-openstack-galera-2

0 commit comments

Comments
 (0)