Add csm columns (#29)

* fix crd permission fix annotation set * Adding columns for csm * Fixing format issues * Update csm_types.go * Update driver-config-params.yaml Co-authored-by: jkumar <[email protected]>
dell · Feb 15, 2022 · 25ec958 · 25ec958
1 parent f0cfa8a
commit 25ec958
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 23 deletions.
diff --git a/api/v1alpha1/csm_types.go b/api/v1alpha1/csm_types.go
@@ -47,6 +47,11 @@ type ContainerStorageModuleStatus struct {
 	State CSMStateType `json:"state,omitempty" yaml:"state"`
 }
 
+// +kubebuilder:validation:Optional
+// +kubebuilder:resource:scope=Namespaced,shortName={"csm"}
+// +kubebuilder:printcolumn:name="CreationTime",type=date,JSONPath=`.metadata.creationTimestamp`
+// +kubebuilder:printcolumn:name="CSIDriverType",type=string,JSONPath=`.spec.driver.csiDriverType`,description="Type of CSIDriver"
+// +kubebuilder:printcolumn:name="ConfigVersion",type=string,JSONPath=`.spec.driver.configVersion`,description="Version of CSIDriver"
 //+kubebuilder:object:root=true
 //+kubebuilder:subresource:status
 

diff --git a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml
@@ -13,10 +13,24 @@ spec:
     kind: ContainerStorageModule
     listKind: ContainerStorageModuleList
     plural: containerstoragemodules
+    shortNames:
+    - csm
     singular: containerstoragemodule
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: CreationTime
+      type: date
+    - description: Type of CSIDriver
+      jsonPath: .spec.driver.csiDriverType
+      name: CSIDriverType
+      type: string
+    - description: Version of CSIDriver
+      jsonPath: .spec.driver.configVersion
+      name: CONFIGVERSION
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ContainerStorageModule is the Schema for the containerstoragemodules
@@ -1031,18 +1045,11 @@ spec:
                           description: Parameters is a map of driver specific parameters
                             for snapshot class
                           type: object
-                      required:
-                      - name
                       type: object
                     type: array
                   tlsCertSecret:
                     description: TLSCertSecret is the name of the TLS Cert secret
                     type: string
-                required:
-                - common
-                - configVersion
-                - csiDriverType
-                - replicas
                 type: object
               modules:
                 description: Modules is list of Container Storage Module modules you
@@ -1258,9 +1265,6 @@ spec:
                     name:
                       description: Name is name of ContainerStorageModule modules
                       type: string
-                  required:
-                  - enabled
-                  - name
                   type: object
                 type: array
             type: object

diff --git a/deploy/crds/storage.dell.com_containerstoragemodules.yaml b/deploy/crds/storage.dell.com_containerstoragemodules.yaml
@@ -11,10 +11,24 @@ spec:
     kind: ContainerStorageModule
     listKind: ContainerStorageModuleList
     plural: containerstoragemodules
+    shortNames:
+    - csm
     singular: containerstoragemodule
   scope: Namespaced
   versions:
-  - name: v1alpha1
+  - additionalPrinterColumns:
+    - jsonPath: .metadata.creationTimestamp
+      name: CreationTime
+      type: date
+    - description: Type of CSIDriver
+      jsonPath: .spec.driver.csiDriverType
+      name: CSIDriverType
+      type: string
+    - description: Version of CSIDriver
+      jsonPath: .spec.driver.configVersion
+      name: CONFIGVERSION
+      type: string
+    name: v1alpha1
     schema:
       openAPIV3Schema:
         description: ContainerStorageModule is the Schema for the containerstoragemodules API
@@ -716,18 +730,11 @@ spec:
                             type: string
                           description: Parameters is a map of driver specific parameters for snapshot class
                           type: object
-                      required:
-                      - name
                       type: object
                     type: array
                   tlsCertSecret:
                     description: TLSCertSecret is the name of the TLS Cert secret
                     type: string
-                required:
-                - common
-                - configVersion
-                - csiDriverType
-                - replicas
                 type: object
               modules:
                 description: Modules is list of Container Storage Module modules you want to deploy
@@ -875,9 +882,6 @@ spec:
                     name:
                       description: Name is name of ContainerStorageModule modules
                       type: string
-                  required:
-                  - enabled
-                  - name
                   type: object
                 type: array
             type: object

diff --git a/operatorconfig/driverconfig/powerscale/v2.1.0/driver-config-params.yaml b/operatorconfig/driverconfig/powerscale/v2.1.0/driver-config-params.yaml
@@ -5,4 +5,4 @@ metadata:
   namespace: <DriverDefaultReleaseNamespace>
 data:
   driver-config-params.yaml: |
-    CSI_LOG_LEVEL: debug
+    CSI_LOG_LEVEL: debug