Skip to content

Commit c919c65

Browse files
committed
Remove redis sample file from config samples
This directory is used for creating CSV sample annotations, so redis related CRs don't belong here. redis CR for the purposes of testing are moved to the kuttl tests directories.
1 parent 36bad9e commit c919c65

File tree

6 files changed

+5
-6
lines changed

6 files changed

+5
-6
lines changed

config/samples/kustomization.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
## Append samples you want in your CSV to this file as resources ##
22
resources:
33
- designate_v1beta1_designate.yaml
4-
- designate_redis.yaml
54
#+kubebuilder:scaffold:manifestskustomizesamples

tests/kuttl/tests/basic/01-deploy-designate.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: TestStep
33
commands:
44
- script: |
55
cp ../../../../config/samples/designate_v1beta1_designate.yaml deploy
6-
cp ../../../../config/samples/designate_redis.yaml deploy
6+
cp redis.yaml deploy
77
cp ../../../../demo/examples/ns_records/ns_records_CR_example.yaml deploy
88
# Do not modify the designate network attachment if it already
99
# exists.

tests/kuttl/tests/basic/deploy/kustomization.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ kind: Kustomization
33
resources:
44
- ./designate_nad.yaml
55
- ./designate_v1beta1_designate.yaml
6-
- ./designate_redis.yaml
6+
- ./redis.yaml

config/samples/designate_redis.yaml renamed to tests/kuttl/tests/basic/redis.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
---
12
apiVersion: redis.openstack.org/v1beta1
23
kind: Redis
34
metadata:

tests/kuttl/tests/designate_scale/00-test-resources.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ commands:
44
- script: |
55
cp ../../common/designate_nad.yaml .
66
oc apply -n $NAMESPACE -f designate_nad.yaml
7+
oc apply -n $NAMESPACE -f redis.yaml
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
1+
---
12
apiVersion: redis.openstack.org/v1beta1
23
kind: Redis
34
metadata:
45
name: designate-redis
56
spec:
67
replicas: 1
7-
tls:
8-
secretName: cert-designate-redis-svc
9-
caBundleSecretName: combined-ca-bundle

0 commit comments

Comments
 (0)