Merge pull request #72 from sp98/fix-clientProfileMapping-API

Use list of BlockPoolMapping in clientProfileMappings spec
ceph · Aug 1, 2024 · e08591b · e08591b
2 parents c4c632a + 97f4625
commit e08591b
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 27 deletions.
diff --git a/api/v1alpha1/clientprofilemapping_types.go b/api/v1alpha1/clientprofilemapping_types.go
@@ -42,7 +42,7 @@ type BlockPoolMappingSpec struct {
 // ClientProfileMappingSpec defines the desired state of ClientProfileMapping
 type ClientProfileMappingSpec struct {
 	//+kubebuilder:validation:Optional
-	BlockPoolMapping *BlockPoolMappingSpec `json:"blockPoolMapping,omitempty"`
+	BlockPoolMapping []BlockPoolMappingSpec `json:"blockPoolMapping,omitempty"`
 }
 
 // ClientProfileMappingStatus defines the observed state of ClientProfileMapping

diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml b/config/crd/bases/csi.ceph.io_clientprofilemappings.yaml
@@ -41,30 +41,32 @@ spec:
             description: ClientProfileMappingSpec defines the desired state of ClientProfileMapping
             properties:
               blockPoolMapping:
-                description: BlockPoolMappingSpec define a mapiing between a local
-                  and remote block pools
-                properties:
-                  local:
-                    description: BlockPoolRefSpec identify a blockpool - client profile
-                      pair
-                    properties:
-                      clientProfileName:
-                        type: string
-                      poolId:
-                        minimum: 0
-                        type: integer
-                    type: object
-                  remote:
-                    description: BlockPoolRefSpec identify a blockpool - client profile
-                      pair
-                    properties:
-                      clientProfileName:
-                        type: string
-                      poolId:
-                        minimum: 0
-                        type: integer
-                    type: object
-                type: object
+                items:
+                  description: BlockPoolMappingSpec define a mapiing between a local
+                    and remote block pools
+                  properties:
+                    local:
+                      description: BlockPoolRefSpec identify a blockpool - client
+                        profile pair
+                      properties:
+                        clientProfileName:
+                          type: string
+                        poolId:
+                          minimum: 0
+                          type: integer
+                      type: object
+                    remote:
+                      description: BlockPoolRefSpec identify a blockpool - client
+                        profile pair
+                      properties:
+                        clientProfileName:
+                          type: string
+                        poolId:
+                          minimum: 0
+                          type: integer
+                      type: object
+                  type: object
+                type: array
             type: object
           status:
             description: ClientProfileMappingStatus defines the observed state of