feat(deployment): add Volumes and ExtraVolumes to PodSpec

Author: maximiliantech

api/common/oidc_types.go

@@ -63,8 +63,6 @@ type RoleBindings struct {
 	RoleRefs []RoleRef `json:"roleRefs"`
 }
 
-// +kubebuilder:validation:XValidation:rule="self.kind == 'Role' && has(self.namespace) && self.namespace != ”", message="namespace must be set if kind is 'Role'"
-// +kubebuilder:validation:XValidation:rule="self.kind == 'ClusterRole' && (!has(self.namespace) || self.namespace == ”)", message="namespace must not be set if kind is 'ClusterRole'"
 type RoleRef struct {
 	// Name is the name of the role or cluster role to bind to the subjects.
 	// +kubebuilder:validation:MinLength=1

api/crds/manifests/clusters.openmcp.cloud_accessrequests.yaml

@@ -139,13 +139,6 @@ spec:
                             - kind
                             - name
                             type: object
-                            x-kubernetes-validations:
-                            - message: namespace must be set if kind is 'Role'
-                              rule: self.kind == 'Role' && has(self.namespace) &&
-                                self.namespace != ”
-                            - message: namespace must not be set if kind is 'ClusterRole'
-                              rule: self.kind == 'ClusterRole' && (!has(self.namespace)
-                                || self.namespace == ”)
                           type: array
                         subjects:
                           description: |-

api/crds/manifests/core.openmcp.cloud_managedcontrolplanev2s.yaml

@@ -123,14 +123,6 @@ spec:
                                   - kind
                                   - name
                                   type: object
-                                  x-kubernetes-validations:
-                                  - message: namespace must be set if kind is 'Role'
-                                    rule: self.kind == 'Role' && has(self.namespace)
-                                      && self.namespace != ”
-                                  - message: namespace must not be set if kind is
-                                      'ClusterRole'
-                                    rule: self.kind == 'ClusterRole' && (!has(self.namespace)
-                                      || self.namespace == ”)
                                 type: array
                               subjects:
                                 description: |-
@@ -232,13 +224,6 @@ spec:
                             - kind
                             - name
                             type: object
-                            x-kubernetes-validations:
-                            - message: namespace must be set if kind is 'Role'
-                              rule: self.kind == 'Role' && has(self.namespace) &&
-                                self.namespace != ”
-                            - message: namespace must not be set if kind is 'ClusterRole'
-                              rule: self.kind == 'ClusterRole' && (!has(self.namespace)
-                                || self.namespace == ”)
                           type: array
                         subjects:
                           description: |-

api/crds/manifests/openmcp.cloud_clusterproviders.yaml

@@ -17,6 +17,7 @@ limitations under the License.
 package v1alpha1
 
 import (
+	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
@@ -45,6 +46,24 @@ type DeploymentSpec struct {
 	// +kubebuilder:validation:Enum=DEBUG;INFO;ERROR
 	// +kubebuilder:default=INFO
 	Verbosity string `json:"verbosity,omitempty"`
+
+	// List of additional volumes that are mounted in the main container.
+	// More info: https://kubernetes.io/docs/concepts/storage/volumes
+	// +optional
+	// +patchMergeKey=name
+	// +patchStrategy=merge,retainKeys
+	// +listType=map
+	// +listMapKey=name
+	ExtraVolumes []corev1.Volume `json:"extraVolumes,omitempty" patchStrategy:"merge,retainKeys" patchMergeKey:"name"`
+
+	// List of additional volume mounts that are mounted in the main container.
+	// Cannot be updated.
+	// +optional
+	// +patchMergeKey=mountPath
+	// +patchStrategy=merge
+	// +listType=map
+	// +listMapKey=mountPath
+	ExtraVolumeMounts []corev1.VolumeMount `json:"extraVolumeMounts,omitempty" patchStrategy:"merge" patchMergeKey:"mountPath"`
 }
 
 // DeploymentStatus defines the observed state of a provider.

api/crds/manifests/openmcp.cloud_platformservices.yaml

@@ -75,11 +75,13 @@ func (m *deploymentMutator) Mutate(d *appsv1.Deployment) error {
 							"--verbosity=" + m.values.Verbosity(),
 							"--provider-name=" + m.values.provider.GetName(),
 						},
-						Env: env,
+						Env:          env,
+						VolumeMounts: m.values.deploymentSpec.ExtraVolumeMounts,
 					},
 				},
 				ImagePullSecrets:   m.values.ImagePullSecrets(),
 				ServiceAccountName: m.values.NamespacedDefaultResourceName(),
+				Volumes:            m.values.deploymentSpec.ExtraVolumes,
 			},
 		},
 	}