Merge pull request #283 from kstrenkova/add-extramounts-parameter

Introduce ExtraMounts to test-operator

Author: openshift-merge-bot[bot]

.zuul.yaml

@@ -11,6 +11,7 @@
               - openstack-k8s-operators-content-provider
             vars:
               cifmw_test_operator_bundle: "{{ content_provider_registry_ip }}:5001/openstack-k8s-operators/test-operator:{{ zuul.patchset }}"
+              cifmw_test_operator_version: "{{ zuul.patchset }}"
     periodic:
       jobs:
         - openstack-k8s-operators-content-provider:
@@ -97,6 +98,21 @@
       cifmw_test_operator_tempest_ntp_extra_images: https://download.cirros-cloud.net/0.6.2/cirros-0.6.2-x86_64-disk.img
       cifmw_test_operator_tempest_network_attachments:
         - ctlplane
+      cifmw_test_operator_tempest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - Tempest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       # Tobiko
       cifmw_run_tobiko: true
@@ -108,13 +124,43 @@
           testenv: 'sanity'
       cifmw_test_operator_tobiko_network_attachments:
         - ctlplane
+      cifmw_test_operator_tobiko_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - Tobiko
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       # Horizontest
       cifmw_run_horizontest: true
       cifmw_test_operator_horizontest_auth_url: "https://keystone-public-openstack.apps-crc.testing"
       cifmw_test_operator_horizontest_dashboard_url: "https://horizon-openstack.apps-crc.testing/"
       cifmw_test_operator_horizontest_extra_flag: "not pagination and test_users.py"
       cifmw_test_operator_horizontest_project_name_xpath: //*[@class="context-project"]//ancestor::ul
+      cifmw_test_operator_horizontest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - HorizonTest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       # Ansibletest
       run_ansibletest: true
@@ -127,6 +173,21 @@
       cifmw_test_operator_ansibletest_ansible_var_files: |
         ---
         foo: bar
+      cifmw_test_operator_ansibletest_extra_mounts:
+        - name: v1
+          region: r1
+          extraVol:
+            - propagation:
+              - AnsibleTest
+              extraVolType: Ceph
+              volumes:
+              - name: ceph
+                secret:
+                  secretName: openstack-config-secret
+              mounts:
+              - name: ceph
+                mountPath: "/etc/ceph"
+                readOnly: true
 
       pre_deploy:
         - name: 61 HCI pre deploy kustomizations
@@ -136,6 +197,7 @@
           type: playbook
           source: control_plane_horizon.yml
 
+
     required-projects: &rp
       - name: openstack-k8s-operators/install_yamls
         override-checkout: main

api/bases/test.openstack.org_ansibletests.yaml

@@ -5,6 +5,7 @@ go 1.21
 require (
 	github.com/google/go-cmp v0.7.0
 	github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0
+	github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0
 	k8s.io/api v0.29.15
 	k8s.io/apimachinery v0.29.15
 	sigs.k8s.io/controller-runtime v0.17.6

api/bases/test.openstack.org_horizontests.yaml

@@ -75,6 +75,8 @@ github.com/onsi/gomega v1.34.1 h1:EUMJIKUjM8sKjYbtxQI9A4z2o+rruxnzNvpknOXie6k=
 github.com/onsi/gomega v1.34.1/go.mod h1:kU1QgUvBDLXBJq618Xvm2LUX6rSAfRaFRTcdOeDLwwY=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0 h1:L2YsApIsUga1ku2siRM/kPViRNk756q+g7jrweAHkdo=
 github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250423055245-3cb2ae8df6f0/go.mod h1:UwHXRIrMSPJD3lFqrA4oKmRXVLFQCRkLAj9x6KLEHiQ=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0 h1:iVGCAds5eVjKEoZS0KSBwYziLeLW3ZBs8PqPMrljPcg=
+github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.0/go.mod h1:cGynoLGY9NfyIeWXI3zZ+hgZdHF3SUi8ht5ygZ8CmhI=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=

api/bases/test.openstack.org_tempests.yaml

@@ -100,7 +100,7 @@ type AnsibleTestSpec struct {
 
 type AnsibleTestWorkflowSpec struct {
 	WorkflowCommonParameters `json:",inline"`
-	CommonOpenstackConfig `json:",inline"`
+	CommonOpenstackConfig    `json:",inline"`
 
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// +kubebuilder:validation:Required

api/bases/test.openstack.org_tobikoes.yaml

@@ -18,6 +18,7 @@ package v1beta1
 
 import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
+	"github.com/openstack-k8s-operators/lib-common/modules/storage"
 	corev1 "k8s.io/api/core/v1"
 )
 
@@ -85,6 +86,11 @@ type CommonOptions struct {
 	// Extra configmaps for mounting inside the pod
 	ExtraConfigmapsMounts []ExtraConfigmapsMounts `json:"extraConfigmapsMounts,omitempty"`
 
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:validation:Optional
+	// ExtraMounts containing conf files, credentials and storage volumes
+	ExtraMounts []ExtraVolMounts `json:"extraMounts,omitempty"`
+
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// This value contains a nodeSelector value that is applied to test pods
@@ -181,3 +187,27 @@ type WorkflowCommonParameters struct {
 	// test pods that are spawned by the test-operator.
 	Tolerations *[]corev1.Toleration `json:"tolerations,omitempty"`
 }
+
+type ExtraVolMounts struct {
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:validation:Optional
+	Name string `json:"name,omitempty"`
+
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:validation:Optional
+	Region string `json:"region,omitempty"`
+
+	// +operator-sdk:csv:customresourcedefinitions:type=spec
+	// +kubebuilder:validation:Required
+	VolMounts []storage.VolMounts `json:"extraVol"`
+}
+
+// Propagate is a function used to filter VolMounts according to the specified
+// PropagationType array
+func (c *ExtraVolMounts) Propagate(svc []storage.PropagationType) []storage.VolMounts {
+	var vl []storage.VolMounts
+	for _, gv := range c.VolMounts {
+		vl = append(vl, gv.Propagate(svc)...)
+	}
+	return vl
+}