Merge branch 'main' into brownfield-changes1

dell · May 24, 2024 · 8d06ae0 · 8d06ae0
2 parents fc230b4 + 1bc6837
commit 8d06ae0
Show file tree

Hide file tree

Showing 50 changed files with 1,721 additions and 869 deletions.
diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml
@@ -88,6 +88,18 @@ jobs:
         with:
           directories: .
           options: -ri
+  yaml_lint_scan:
+    name: Run Yaml Lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the code
+        uses: actions/checkout@v4
+      - name: setup python
+        uses: actions/setup-python@v5
+        with:
+          python-version: "3.12"
+      - run: pip install yamllint
+      - run: yamllint .
   image_security_scan:
     name: Image Scanner
     runs-on: ubuntu-latest

diff --git a/.yamllint.yaml b/.yamllint.yaml
@@ -0,0 +1,31 @@
+---
+yaml-files:
+  - "*.yaml"
+  - "*.yml"
+  - ".yamllint"
+
+rules:
+  braces: enable
+  brackets: enable
+  colons: enable
+  commas: enable
+  comments:
+    level: warning
+  comments-indentation:
+    level: warning
+  document-end: disable
+  document-start: disable
+  empty-lines: enable
+  empty-values: disable
+  hyphens: enable
+  indentation: enable
+  key-duplicates: enable
+  key-ordering: disable
+  line-length: disable
+  new-line-at-end-of-file: enable
+  new-lines: enable
+  octal-values: disable
+  quoted-strings: disable
+  trailing-spaces: enable
+  truthy:
+    level: warning
diff --git a/Makefile b/Makefile
@@ -159,10 +159,10 @@ rm -rf $$TMP_DIR ;\
 endef
 
 .PHONY: bundle
-bundle: static-manifests gen-semver kustomize ## Generate bundle manifests and metadata, then validate generated files.
+bundle: static-manifests gen-semver kustomize ## Generate bundle manifests and metadata, then validate generated files. Set --use-image-digests=true to use SHA ID of image instead of image tag.
 	operator-sdk generate kustomize manifests -q
 	cd config/manager && $(KUSTOMIZE) edit set image controller=$(IMG)
-	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS)
+	$(KUSTOMIZE) build config/manifests | operator-sdk generate bundle -q --overwrite --version $(BUNDLE_VERSION) $(BUNDLE_METADATA_OPTS) --use-image-digests=false
 	operator-sdk bundle validate ./bundle
 
 .PHONY: bundle-build

diff --git a/api/v1/csm_types.go b/api/v1/csm_types.go
@@ -104,6 +104,26 @@ func (cr *ContainerStorageModule) GetDriverType() DriverType {
 	return cr.Spec.Driver.CSIDriverType
 }
 
+// GetModule - Returns the module of type moduleType
+func (cr *ContainerStorageModule) GetModule(moduleType ModuleType) Module {
+	for _, m := range cr.Spec.Modules {
+		if m.Name == moduleType {
+			return m
+		}
+	}
+	return Module{}
+}
+
+// HasModule - Returns true if the cr has a module of type moduleType
+func (cr *ContainerStorageModule) HasModule(moduleType ModuleType) bool {
+	for _, m := range cr.Spec.Modules {
+		if m.Name == moduleType {
+			return true
+		}
+	}
+	return false
+}
+
 // IsBeingDeleted  - Returns  true if a deletion timestamp is set
 func (cr *ContainerStorageModule) IsBeingDeleted() bool {
 	return !cr.ObjectMeta.DeletionTimestamp.IsZero()

diff --git a/api/v1/types.go b/api/v1/types.go
@@ -31,6 +31,11 @@ type DriverType string
 // ModuleType - type representing the type of the modules. e.g. - authorization, podmon
 type ModuleType string
 
+// CSMComponentType - type constraint for DriverType and ModuleType
+type CSMComponentType interface {
+	ModuleType | DriverType
+}
+
 // ObservabilityComponentType - type representing the type of components inside observability module. e.g. - topology
 type ObservabilityComponentType string
 

diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -1393,7 +1393,7 @@ metadata:
     capabilities: Seamless Upgrades
     categories: Storage
     containerImage: docker.io/dellemc/dell-csm-operator:v1.5.0
-    createdAt: "2024-03-19T11:05:35Z"
+    createdAt: "2024-04-10T09:49:32Z"
     description: Easily install and manage Dell’s CSI Drivers and CSM
     features.operators.openshift.io/disconnected: "true"
     features.operators.openshift.io/fips-compliant: "false"
@@ -1743,11 +1743,6 @@ spec:
         displayName: Use Private CA Certs
         path: client.usePrivateCaCerts
       statusDescriptors:
-      - description: ClientStatus is the status of Client pods
-        displayName: ClientStatus
-        path: clientStatus
-        x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podStatuses
       - description: State is the state of the client installation
         displayName: State
         path: state
@@ -2530,19 +2525,34 @@ spec:
         displayName: Name
         path: modules[0].name
       statusDescriptors:
-      - description: ControllerStatus is the status of Controller pods
-        displayName: ControllerStatus
-        path: controllerStatus
+      - description: Number of Available Controller pods
+        displayName: Available
+        path: controllerStatus.available
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podStatuses
-      - description: NodeStatus is the status of Controller pods
-        displayName: NodeStatus
-        path: nodeStatus
+        - urn:alm:descriptor:text
+      - description: Number of Desired Controller pods
+        displayName: Desired
+        path: controllerStatus.desired
         x-descriptors:
-        - urn:alm:descriptor:com.tectonic.ui:podStatuses
-      - description: State is the state of the driver installation
-        displayName: State
-        path: state
+        - urn:alm:descriptor:text
+      - description: Number of Failed Controller pods
+        displayName: Failed
+        path: controllerStatus.failed
+        x-descriptors:
+        - urn:alm:descriptor:text
+      - description: Number of Available Node pods
+        displayName: Available
+        path: nodeStatus.available
+        x-descriptors:
+        - urn:alm:descriptor:text
+      - description: Number of Desired Node pods
+        displayName: Desired
+        path: nodeStatus.desired
+        x-descriptors:
+        - urn:alm:descriptor:text
+      - description: Number of Failed Node pods
+        displayName: Failed
+        path: nodeStatus.failed
         x-descriptors:
         - urn:alm:descriptor:text
       version: v1
@@ -2581,6 +2591,12 @@ spec:
     spec:
       clusterPermissions:
       - rules:
+        - apiGroups:
+          - '*'
+          resources:
+          - '*'
+          verbs:
+          - '*'
         - nonResourceURLs:
           - /metrics
           verbs:
@@ -3633,6 +3649,8 @@ spec:
           - list
           - update
           - watch
+          - get
+          - patch
         serviceAccountName: dell-csm-operator-manager-service-account
       deployments:
       - label:
@@ -3646,6 +3664,8 @@ spec:
           strategy: {}
           template:
             metadata:
+              annotations:
+                storage.dell.com/CSMVersion: v1.10.0
               labels:
                 control-plane: controller-manager
             spec:
@@ -3668,6 +3688,61 @@ spec:
                 - --leader-elect
                 command:
                 - /manager
+                env:
+                - name: RELATED_IMAGE_dell-csm-operator
+                  value: docker.io/dellemc/dell-csm-operator:v1.5.0
+                - name: RELATED_IMAGE_csi-isilon
+                  value: docker.io/dellemc/csi-isilon:v2.10.0
+                - name: RELATED_IMAGE_csi-powermax
+                  value: docker.io/dellemc/csi-powermax:v2.10.0
+                - name: RELATED_IMAGE_csipowermax-reverseproxy
+                  value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0
+                - name: RELATED_IMAGE_csi-powerstore
+                  value: docker.io/dellemc/csi-powerstore:v2.10.0
+                - name: RELATED_IMAGE_csi-unity
+                  value: docker.io/dellemc/csi-unity:v2.10.0
+                - name: RELATED_IMAGE_csi-vxflexos
+                  value: docker.io/dellemc/csi-vxflexos:v2.10.0
+                - name: RELATED_IMAGE_sdc
+                  value: docker.io/dellemc/sdc:4.5.1
+                - name: RELATED_IMAGE_karavi-authorization-proxy
+                  value: docker.io/dellemc/csm-authorization-sidecar:v1.10.0
+                - name: RELATED_IMAGE_dell-csi-replicator
+                  value: docker.io/dellemc/dell-csi-replicator:v1.8.0
+                - name: RELATED_IMAGE_dell-replication-controller-manager
+                  value: docker.io/dellemc/dell-replication-controller:v1.8.0
+                - name: RELATED_IMAGE_topology
+                  value: docker.io/dellemc/csm-topology:v1.8.0
+                - name: RELATED_IMAGE_otel-collector
+                  value: docker.io/otel/opentelemetry-collector:0.42.0
+                - name: RELATED_IMAGE_metrics-powerscale
+                  value: docker.io/dellemc/csm-metrics-powerscale:v1.5.0
+                - name: RELATED_IMAGE_metrics-powermax
+                  value: docker.io/dellemc/csm-metrics-powermax:v1.3.0
+                - name: RELATED_IMAGE_metrics-powerflex
+                  value: docker.io/dellemc/csm-metrics-powerflex:v1.8.0
+                - name: RELATED_IMAGE_podmon-node
+                  value: docker.io/dellemc/podmon:v1.9.0
+                - name: RELATED_IMAGE_kube-rbac-proxy
+                  value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+                - name: RELATED_IMAGE_attacher
+                  value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+                - name: RELATED_IMAGE_provisioner
+                  value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+                - name: RELATED_IMAGE_snapshotter
+                  value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+                - name: RELATED_IMAGE_registrar
+                  value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+                - name: RELATED_IMAGE_resizer
+                  value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+                - name: RELATED_IMAGE_externalhealthmonitorcontroller
+                  value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+                - name: RELATED_IMAGE_metadataretriever
+                  value: dellemc/csi-metadata-retriever:v1.7.2
+                - name: RELATED_IMAGE_dell-connectivity-client
+                  value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
+                - name: RELATED_IMAGE_cert-persister
+                  value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
                 image: docker.io/dellemc/dell-csm-operator:v1.5.0
                 imagePullPolicy: Always
                 livenessProbe:
@@ -3729,19 +3804,19 @@ spec:
     name: Dell Technologies
     url: https://github.com/dell/csm-operator
   relatedImages:
-  - image: docker.io/dellemc/dell-csm-operator:v1.4.1
+  - image: docker.io/dellemc/dell-csm-operator:v1.5.0
     name: dell-csm-operator
-  - image: docker.io/dellemc/csi-isilon:v2.9.1
+  - image: docker.io/dellemc/csi-isilon:v2.10.0
     name: csi-isilon
-  - image: docker.io/dellemc/csi-powermax:v2.9.1
+  - image: docker.io/dellemc/csi-powermax:v2.10.0
     name: csi-powermax
-  - image: docker.io/dellemc/csipowermax-reverseproxy:v2.8.1
+  - image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0
     name: csipowermax-reverseproxy
-  - image: docker.io/dellemc/csi-powerstore:v2.9.1
+  - image: docker.io/dellemc/csi-powerstore:v2.10.0
     name: csi-powerstore
-  - image: docker.io/dellemc/csi-unity:v2.9.1
+  - image: docker.io/dellemc/csi-unity:v2.10.0
     name: csi-unity
-  - image: docker.io/dellemc/csi-vxflexos:v2.9.1
+  - image: docker.io/dellemc/csi-vxflexos:v2.10.0
     name: csi-vxflexos
   - image: docker.io/dellemc/sdc:4.5.1
     name: sdc

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -14,6 +14,8 @@ spec:
     metadata:
       labels:
         control-plane: controller-manager
+      annotations:
+        storage.dell.com/CSMVersion: v1.10.0
     spec:
       serviceAccountName: manager-service-account
       securityContext:
@@ -26,6 +28,61 @@ spec:
         image: controller:latest
         imagePullPolicy:  Always
         name: manager
+        env:
+        - value: docker.io/dellemc/dell-csm-operator:v1.5.0
+          name: RELATED_IMAGE_dell-csm-operator
+        - value: docker.io/dellemc/csi-isilon:v2.10.0
+          name: RELATED_IMAGE_csi-isilon
+        - value: docker.io/dellemc/csi-powermax:v2.10.0
+          name: RELATED_IMAGE_csi-powermax
+        - value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0
+          name: RELATED_IMAGE_csipowermax-reverseproxy
+        - value: docker.io/dellemc/csi-powerstore:v2.10.0
+          name: RELATED_IMAGE_csi-powerstore
+        - value: docker.io/dellemc/csi-unity:v2.10.0
+          name: RELATED_IMAGE_csi-unity
+        - value: docker.io/dellemc/csi-vxflexos:v2.10.0
+          name: RELATED_IMAGE_csi-vxflexos
+        - value: docker.io/dellemc/sdc:4.5.1
+          name: RELATED_IMAGE_sdc
+        - value: docker.io/dellemc/csm-authorization-sidecar:v1.10.0
+          name: RELATED_IMAGE_karavi-authorization-proxy
+        - value: docker.io/dellemc/dell-csi-replicator:v1.8.0
+          name: RELATED_IMAGE_dell-csi-replicator
+        - value: docker.io/dellemc/dell-replication-controller:v1.8.0
+          name: RELATED_IMAGE_dell-replication-controller-manager
+        - value: docker.io/dellemc/csm-topology:v1.8.0
+          name: RELATED_IMAGE_topology
+        - value: docker.io/otel/opentelemetry-collector:0.42.0
+          name: RELATED_IMAGE_otel-collector
+        - value: docker.io/dellemc/csm-metrics-powerscale:v1.5.0
+          name: RELATED_IMAGE_metrics-powerscale
+        - value: docker.io/dellemc/csm-metrics-powermax:v1.3.0
+          name: RELATED_IMAGE_metrics-powermax
+        - value: docker.io/dellemc/csm-metrics-powerflex:v1.8.0
+          name: RELATED_IMAGE_metrics-powerflex
+        - value: docker.io/dellemc/podmon:v1.9.0
+          name: RELATED_IMAGE_podmon-node
+        - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0
+          name: RELATED_IMAGE_kube-rbac-proxy
+        - value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+          name: RELATED_IMAGE_attacher
+        - value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
+          name: RELATED_IMAGE_provisioner
+        - value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+          name: RELATED_IMAGE_snapshotter
+        - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+          name: RELATED_IMAGE_registrar
+        - value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+          name: RELATED_IMAGE_resizer
+        - value: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
+          name: RELATED_IMAGE_externalhealthmonitorcontroller
+        - value: dellemc/csi-metadata-retriever:v1.7.2
+          name: RELATED_IMAGE_metadataretriever
+        - value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
+          name: RELATED_IMAGE_dell-connectivity-client
+        - value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0
+          name: RELATED_IMAGE_cert-persister
         securityContext:
           allowPrivilegeEscalation: false
         livenessProbe: