Merge pull request #145 from leelavg/rename-claim-type

make value of storageclaim type case insensitive and consistent
red-hat-storage · Apr 22, 2024 · 29394b2 · 29394b2
2 parents 00598f9 + 44f5a68
commit 29394b2
Show file tree

Hide file tree

Showing 19 changed files with 20 additions and 355 deletions.
diff --git a/api/v1alpha1/storageclaim_types.go b/api/v1alpha1/storageclaim_types.go
@@ -46,7 +46,7 @@ type StorageClaimStatus struct {
 
 // StorageClaimSpec defines the desired state of StorageClaim
 type StorageClaimSpec struct {
-	//+kubebuilder:validation:Enum=block;sharedfile
+	//+kubebuilder:validation:XValidation:rule="self.lowerAscii()=='block'||self.lowerAscii()=='sharedfile'",message="value should be either 'sharedfile' or 'block'"
 	Type             string `json:"type"`
 	EncryptionMethod string `json:"encryptionMethod,omitempty"`
 	StorageProfile   string `json:"storageProfile,omitempty"`

diff --git a/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml b/bundle/manifests/ocs-client-operator.clusterserviceversion.yaml
@@ -19,11 +19,6 @@ spec:
       kind: StorageClaim
       name: storageclaims.ocs.openshift.io
       version: v1alpha1
-    - description: StorageClassClaim is the Schema for the storageclassclaims API
-      displayName: Storage Class Claim
-      kind: StorageClassClaim
-      name: storageclassclaims.ocs.openshift.io
-      version: v1alpha1
     - description: StorageClient is the Schema for the storageclients API
       displayName: Storage Client
       kind: StorageClient
@@ -202,32 +197,6 @@ spec:
           - get
           - patch
           - update
-        - apiGroups:
-          - ocs.openshift.io
-          resources:
-          - storageclassclaims
-          verbs:
-          - create
-          - delete
-          - get
-          - list
-          - patch
-          - update
-          - watch
-        - apiGroups:
-          - ocs.openshift.io
-          resources:
-          - storageclassclaims/finalizers
-          verbs:
-          - update
-        - apiGroups:
-          - ocs.openshift.io
-          resources:
-          - storageclassclaims/status
-          verbs:
-          - get
-          - patch
-          - update
         - apiGroups:
           - ocs.openshift.io
           resources:

diff --git a/bundle/manifests/ocs.openshift.io_storageclaims.yaml b/bundle/manifests/ocs.openshift.io_storageclaims.yaml
@@ -54,10 +54,10 @@ spec:
               storageProfile:
                 type: string
               type:
-                enum:
-                - block
-                - sharedfile
                 type: string
+                x-kubernetes-validations:
+                - message: value should be either 'sharedfile' or 'block'
+                  rule: self.lowerAscii()=='block'||self.lowerAscii()=='sharedfile'
             required:
             - storageClient
             - type

diff --git a/bundle/manifests/ocs.openshift.io_storageclassclaims.yaml b/bundle/manifests/ocs.openshift.io_storageclassclaims.yaml
diff --git a/config/crd/bases/ocs.openshift.io_storageclaims.yaml b/config/crd/bases/ocs.openshift.io_storageclaims.yaml
@@ -55,10 +55,10 @@ spec:
               storageProfile:
                 type: string
               type:
-                enum:
-                - block
-                - sharedfile
                 type: string
+                x-kubernetes-validations:
+                - message: value should be either 'sharedfile' or 'block'
+                  rule: self.lowerAscii()=='block'||self.lowerAscii()=='sharedfile'
             required:
             - storageClient
             - type

diff --git a/config/crd/bases/ocs.openshift.io_storageclassclaims.yaml b/config/crd/bases/ocs.openshift.io_storageclassclaims.yaml
diff --git a/config/crd/kustomization.yaml b/config/crd/kustomization.yaml
@@ -3,22 +3,19 @@
 # It should be run by config/default
 resources:
 - bases/ocs.openshift.io_storageclients.yaml
-- bases/ocs.openshift.io_storageclassclaims.yaml
 - bases/ocs.openshift.io_storageclaims.yaml
 #+kubebuilder:scaffold:crdkustomizeresource
 
 patchesStrategicMerge:
 # [WEBHOOK] To enable webhook, uncomment all the sections with [WEBHOOK] prefix.
 # patches here are for enabling the conversion webhook for each CRD
 #- patches/webhook_in_storageclients.yaml
-#- patches/webhook_in_storageclassclaims.yaml
 #- patches/webhook_in_storageclaims.yaml
 #+kubebuilder:scaffold:crdkustomizewebhookpatch
 
 # [CERTMANAGER] To enable cert-manager, uncomment all the sections with [CERTMANAGER] prefix.
 # patches here are for enabling the CA injection for each CRD
 #- patches/cainjection_in_storageclients.yaml
-#- patches/cainjection_in_storageclassclaims.yaml
 #- patches/cainjection_in_storageclaims.yaml
 #+kubebuilder:scaffold:crdkustomizecainjectionpatch
 

diff --git a/config/crd/patches/cainjection_in_storageclassclaims.yaml b/config/crd/patches/cainjection_in_storageclassclaims.yaml
diff --git a/config/crd/patches/webhook_in_storageclassclaims.yaml b/config/crd/patches/webhook_in_storageclassclaims.yaml
diff --git a/config/manifests/bases/ocs-client-operator.clusterserviceversion.yaml b/config/manifests/bases/ocs-client-operator.clusterserviceversion.yaml
@@ -16,11 +16,6 @@ spec:
       kind: StorageClaim
       name: storageclaims.ocs.openshift.io
       version: v1alpha1
-    - description: StorageClassClaim is the Schema for the storageclassclaims API
-      displayName: Storage Class Claim
-      kind: StorageClassClaim
-      name: storageclassclaims.ocs.openshift.io
-      version: v1alpha1
     - description: StorageClient is the Schema for the storageclients API
       displayName: Storage Client
       kind: StorageClient

diff --git a/config/rbac/storageclassclaim_editor_role.yaml b/config/rbac/storageclassclaim_editor_role.yaml