Merge pull request #831 from olliewalsh/libvirt_sasl

Set default secret in libvirt service
openstack-k8s-operators · Apr 17, 2024 · 6353831 · 6353831
2 parents 0230e25 + 7159533
commit 6353831
Show file tree

Hide file tree

Showing 5 changed files with 40 additions and 0 deletions.
diff --git a/config/services/dataplane_v1beta1_openstackdataplaneservice_libvirt.yaml b/config/services/dataplane_v1beta1_openstackdataplaneservice_libvirt.yaml
@@ -4,6 +4,10 @@ metadata:
   name: libvirt
 spec:
   playbook: osp.edpm.libvirt
+  secrets:
+    # NOTE: this Secret needs to be created before deploying the data plane.
+    # It should contain the libvirt sasl auth password using the key LibvirtPassword
+    - libvirt-secret
   tlsCert:
     contents:
       - dnsnames

diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/00-dataplane-create.yaml
@@ -58,6 +58,13 @@ data:
   ssh-privatekey: ZmFrZQo=
   ssh-publickey: ZmFrZQo=
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: libvirt-secret
+data:
+  LibvirtPassword: ZmFrZQo=
+---
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneService
 metadata:

diff --git a/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-global-service-test/01-assert.yaml
@@ -883,6 +883,17 @@ spec:
   backoffLimit: 6
   envConfigMapName: openstack-aee-default-env
   extraMounts:
+  - mounts:
+    - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword
+      name: libvirt-secret-0
+      subPath: LibvirtPassword
+    volumes:
+    - name: libvirt-secret-0
+      secret:
+        items:
+        - key: LibvirtPassword
+          path: LibvirtPassword
+        secretName: libvirt-secret
   - mounts:
     - mountPath: /runner/env/ssh_key
       name: ssh-key

diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-dataplane-create.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/00-dataplane-create.yaml
@@ -59,6 +59,13 @@ data:
   ssh-privatekey: ZmFrZQo=
   ssh-publickey: ZmFrZQo=
 ---
+apiVersion: v1
+kind: Secret
+metadata:
+  name: libvirt-secret
+data:
+  LibvirtPassword: ZmFrZQo=
+---
 apiVersion: dataplane.openstack.org/v1beta1
 kind: OpenStackDataPlaneNodeSet
 metadata:

diff --git a/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml b/tests/kuttl/tests/dataplane-deploy-no-nodes-test/01-assert.yaml
@@ -808,6 +808,17 @@ spec:
   backoffLimit: 6
   envConfigMapName: openstack-aee-default-env
   extraMounts:
+  - mounts:
+    - mountPath: /var/lib/openstack/configs/libvirt/LibvirtPassword
+      name: libvirt-secret-0
+      subPath: LibvirtPassword
+    volumes:
+    - name: libvirt-secret-0
+      secret:
+        items:
+        - key: LibvirtPassword
+          path: LibvirtPassword
+        secretName: libvirt-secret
   - mounts:
     - mountPath: /runner/env/ssh_key
       name: ssh-key