Update kuttl tests

Signed-off-by: Veronika Fisarova <[email protected]>
openstack-k8s-operators · Feb 1, 2024 · c4f37a2 · c4f37a2
1 parent 05d6cc0
commit c4f37a2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 10 deletions.
diff --git a/config/samples/layout/cephfs/cephfs.yaml b/config/samples/layout/cephfs/cephfs.yaml
@@ -8,6 +8,13 @@ spec:
       customServiceConfig: |
          [DEFAULT]
          enabled_share_protocols = cephfs
+      tls:
+        api:
+          internal:
+            secretName: cert-manila-internal-svc
+          public:
+            secretName: cert-manila-public-svc
+        caBundleSecretName: combined-ca-bundle
   manilaShares:
     share0:
       customServiceConfig: |
@@ -21,6 +28,8 @@ spec:
          cephfs_auth_id=openstack
          cephfs_cluster_name=ceph
          cephfs_protocol_helper_type=CEPHFS
+    tls:
+        caBundleSecretName: combined-ca-bundle
   extraMounts:
     - name: v1
       region: r1

diff --git a/config/samples/layout/multibackend/multibackend.yaml b/config/samples/layout/multibackend/multibackend.yaml
@@ -8,6 +8,13 @@ spec:
       customServiceConfig: |
          [DEFAULT]
          enabled_share_protocols=nfs,cephfs,cifs
+      tls:
+        api:
+          internal:
+            secretName: cert-manila-internal-svc
+          public:
+            secretName: cert-manila-public-svc
+        caBundleSecretName: combined-ca-bundle
   manilaShares:
     share0:
       customServiceConfig: |
@@ -21,6 +28,8 @@ spec:
          cephfs_auth_id=openstack
          cephfs_cluster_name=ceph
          cephfs_protocol_helper_type=CEPHFS
+      tls:
+        caBundleSecretName: combined-ca-bundle
       replicas: 1
     share1:
       customServiceConfig: |
@@ -34,6 +43,8 @@ spec:
           cephfs_cluster_name=ceph
           cephfs_nfs_cluster_id=cephfs
           cephfs_protocol_helper_type=NFS
+      tls:
+        caBundleSecretName: combined-ca-bundle
       replicas: 1
   extraMounts:
     - name: v1

diff --git a/config/samples/manila_v1beta1_manila_tls.yaml b/config/samples/manila_v1beta1_manila_tls.yaml
@@ -20,6 +20,10 @@ spec:
           public:
             secretName: cert-manila-public-svc
         caBundleSecretName: combined-ca-bundle
-  manilaScheduler: {}
+  manilaScheduler:
+    tls:
+      caBundleSecretName: combined-ca-bundle
   manilaShares:
-    share1: {}
+    share1:
+      tls:
+        caBundleSecretName: combined-ca-bundle
diff --git a/test/kuttl/tests/manila-basic/01-assert.yaml b/test/kuttl/tests/manila-basic/01-assert.yaml
@@ -118,10 +118,6 @@ status:
         reason: Ready
         status: "True"
         type: ServiceConfigReady
-      - message: Input data complete
-        reason: Ready
-        status: "True"
-        type: TLSInputReady
    databaseHostname: openstack
    manilaAPIReadyCount: 1
    manilaSchedulerReadyCount: 1

diff --git a/test/kuttl/tests/manila-multibackend/01-assert.yaml b/test/kuttl/tests/manila-multibackend/01-assert.yaml
@@ -128,10 +128,6 @@ status:
         reason: Ready
         status: "True"
         type: ServiceConfigReady
-      - message: Input data complete
-        reason: Ready
-        status: "True"
-        type: TLSInputReady
    databaseHostname: openstack
    manilaAPIReadyCount: 1
    manilaSchedulerReadyCount: 1
@@ -219,6 +215,10 @@ status:
     reason: Ready
     status: "True"
     type: ServiceConfigReady
+  - message: Input data complete
+    reason: Ready
+    status: "True"
+    type: TLSInputReady
   readyCount: 1
 ---
 # when using image digests the containerImage URLs are SHA's so we verify them with a script