Merge pull request #276 from beagles/remove_redis_config_samples

Remove redis sample file from config samples

Author: openshift-merge-bot[bot]

config/samples/kustomization.yaml

@@ -1,5 +1,4 @@
 ## Append samples you want in your CSV to this file as resources ##
 resources:
 - designate_v1beta1_designate.yaml
-- designate_redis.yaml
 #+kubebuilder:scaffold:manifestskustomizesamples

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

@@ -3,7 +3,7 @@ kind: TestStep
 commands:
   - script: |
       cp ../../../../config/samples/designate_v1beta1_designate.yaml deploy
-      cp ../../../../config/samples/designate_redis.yaml deploy
+      cp redis.yaml deploy
       cp ../../../../demo/examples/ns_records/ns_records_CR_example.yaml deploy
       # Do not modify the designate network attachment if it already
       # exists.

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

@@ -3,4 +3,4 @@ kind: Kustomization
 resources:
 - ./designate_nad.yaml
 - ./designate_v1beta1_designate.yaml
-- ./designate_redis.yaml
+- ./redis.yaml

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

@@ -1,3 +1,4 @@
+---
 apiVersion: redis.openstack.org/v1beta1
 kind: Redis
 metadata:

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

@@ -4,3 +4,4 @@ commands:
   - script: |
       cp ../../common/designate_nad.yaml .
       oc apply -n $NAMESPACE -f designate_nad.yaml
+      oc apply -n $NAMESPACE -f redis.yaml

config/samples/designate_redis_tls.yaml renamed to tests/kuttl/tests/designate_scale/redis.yaml

@@ -1,9 +1,7 @@
+---
 apiVersion: redis.openstack.org/v1beta1
 kind: Redis
 metadata:
   name: designate-redis
 spec:
   replicas: 1
-  tls:
-    secretName: cert-designate-redis-svc
-    caBundleSecretName: combined-ca-bundle