Merge pull request #165 from iPraveenParihar/api/cephfs-radosnamespace

api: add radosNamespace field to CephFsConfigSpec

Author: nb-ohad

api/v1alpha1/clientprofile_types.go

@@ -31,10 +31,15 @@ type CephFsConfigSpec struct {
 
 	//+kubebuilder:validation:Optional
 	FuseMountOptions map[string]string `json:"fuseMountOptions,omitempty"`
+
+	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="field is immutable"
+	//+kubebuilder:validation:Optional
+	RadosNamespace *string `json:"radosNamespace,omitempty"`
 }
 
 // RbdConfigSpec defines the desired RBD configuration
 type RbdConfigSpec struct {
+	//+kubebuilder:validation:XValidation:rule="self == oldSelf",message="field is immutable"
 	//+kubebuilder:validation:Optional
 	RadosNamespace string `json:"radosNamespace,omitempty"`
 }

api/v1alpha1/zz_generated.deepcopy.go

@@ -74,6 +74,11 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  radosNamespace:
+                    type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                   subVolumeGroup:
                     type: string
                 type: object
@@ -85,6 +90,9 @@ spec:
                 properties:
                   radosNamespace:
                     type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                 type: object
             required:
             - cephConnectionRef

config/crd/bases/csi.ceph.io_clientprofiles.yaml

@@ -222,6 +222,11 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  radosNamespace:
+                    type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                   subVolumeGroup:
                     type: string
                 type: object
@@ -233,6 +238,9 @@ spec:
                 properties:
                   radosNamespace:
                     type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                 type: object
             required:
             - cephConnectionRef

deploy/all-in-one/install.yaml

@@ -75,6 +75,11 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  radosNamespace:
+                    type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                   subVolumeGroup:
                     type: string
                 type: object
@@ -86,6 +91,9 @@ spec:
                 properties:
                   radosNamespace:
                     type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                 type: object
             required:
             - cephConnectionRef

deploy/charts/ceph-csi-operator/templates/clientprofile-crd.yaml

@@ -213,6 +213,11 @@ spec:
                     additionalProperties:
                       type: string
                     type: object
+                  radosNamespace:
+                    type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                   subVolumeGroup:
                     type: string
                 type: object
@@ -224,6 +229,9 @@ spec:
                 properties:
                   radosNamespace:
                     type: string
+                    x-kubernetes-validations:
+                    - message: field is immutable
+                      rule: self == oldSelf
                 type: object
             required:
             - cephConnectionRef

deploy/multifile/crd.yaml

@@ -349,6 +349,7 @@ spec:
     subvolumeGroup: csi
     kernelMountOptions: readdir_max_bytes=1048576,norbytes
     fuseMountOptions: debug
+    radosNamespace: rados-test-cephfs
   rbd:
     radosNamespace: rados-test
 status: {}

docs/design/operator.md

@@ -26,6 +26,7 @@ import (
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/utils/ptr"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/builder"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -69,6 +70,7 @@ type csiClusterInfoRecord struct {
 		SubvolumeGroup     string `json:"subvolumeGroup,omitempty"`
 		KernelMountOptions string `json:"kernelMountOptions"`
 		FuseMountOptions   string `json:"fuseMountOptions"`
+		RadosNamespace     string `json:"radosNamespace,omitempty"`
 	} `json:"cephFS,omitempty"`
 	Rbd struct {
 		RadosNamespace string `json:"radosNamespace,omitempty"`
@@ -313,6 +315,7 @@ func composeCsiClusterInfoRecord(clientProfile *csiv1a1.ClientProfile, cephConn
 	record.Monitors = cephConn.Spec.Monitors
 	if cephFs := clientProfile.Spec.CephFs; cephFs != nil {
 		record.CephFs.SubvolumeGroup = cephFs.SubVolumeGroup
+		record.CephFs.RadosNamespace = ptr.Deref(cephFs.RadosNamespace, "")
 		if mountOpt := cephFs.KernelMountOptions; mountOpt != nil {
 			record.CephFs.KernelMountOptions = utils.MapToString(mountOpt, "=", ",")
 		}