metadata retriever sidecar update (#566)

* metadata retriver sidecar update * metadata retriver sidecar update
dell · May 31, 2024 · acd5991 · acd5991
1 parent 7a69b2c
commit acd5991
Show file tree

Hide file tree

Showing 21 changed files with 189 additions and 59 deletions.
diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml
@@ -190,7 +190,7 @@ metadata:
                   "name": "snapshotter"
                 },
                 {
-                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "image": "dellemc/csi-metadata-retriever:v1.7.3",
                   "name": "csi-metadata-retriever"
                 },
                 {
@@ -556,7 +556,7 @@ metadata:
                   "name": "snapshotter"
                 },
                 {
-                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "image": "dellemc/csi-metadata-retriever:v1.7.3",
                   "name": "csi-metadata-retriever"
                 },
                 {
@@ -850,7 +850,7 @@ metadata:
                   "name": "snapshotter"
                 },
                 {
-                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "image": "dellemc/csi-metadata-retriever:v1.7.3",
                   "name": "csi-metadata-retriever"
                 },
                 {
@@ -1019,7 +1019,7 @@ metadata:
                   "name": "snapshotter"
                 },
                 {
-                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "image": "dellemc/csi-metadata-retriever:v1.7.3",
                   "name": "csi-metadata-retriever"
                 },
                 {
@@ -1161,7 +1161,7 @@ metadata:
                   "name": "snapshotter"
                 },
                 {
-                  "image": "dellemc/csi-metadata-retriever:v1.7.2",
+                  "image": "dellemc/csi-metadata-retriever:v1.7.3",
                   "name": "csi-metadata-retriever"
                 },
                 {
@@ -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.2
               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.1
+                - name: RELATED_IMAGE_csi-isilon
+                  value: docker.io/dellemc/csi-isilon:v2.10.1
+                - name: RELATED_IMAGE_csi-powermax
+                  value: docker.io/dellemc/csi-powermax:v2.10.1
+                - name: RELATED_IMAGE_csipowermax-reverseproxy
+                  value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1
+                - name: RELATED_IMAGE_csi-powerstore
+                  value: docker.io/dellemc/csi-powerstore:v2.10.1
+                - name: RELATED_IMAGE_csi-unity
+                  value: docker.io/dellemc/csi-unity:v2.10.1
+                - name: RELATED_IMAGE_csi-vxflexos
+                  value: docker.io/dellemc/csi-vxflexos:v2.10.1
+                - 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.1
+                - name: RELATED_IMAGE_dell-csi-replicator
+                  value: docker.io/dellemc/dell-csi-replicator:v1.8.1
+                - name: RELATED_IMAGE_dell-replication-controller-manager
+                  value: docker.io/dellemc/dell-replication-controller:v1.8.1
+                - name: RELATED_IMAGE_topology
+                  value: docker.io/dellemc/csm-topology:v1.8.1
+                - 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.1
+                - name: RELATED_IMAGE_metrics-powermax
+                  value: docker.io/dellemc/csm-metrics-powermax:v1.3.1
+                - name: RELATED_IMAGE_metrics-powerflex
+                  value: docker.io/dellemc/csm-metrics-powerflex:v1.8.1
+                - name: RELATED_IMAGE_podmon-node
+                  value: docker.io/dellemc/podmon:v1.9.1
+                - 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.3
+                - 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.1
                 imagePullPolicy: Always
                 livenessProbe:
@@ -3777,7 +3852,7 @@ spec:
     name: resizer
   - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
     name: externalhealthmonitorcontroller
-  - image: dellemc/csi-metadata-retriever:v1.7.2
+  - image: dellemc/csi-metadata-retriever:v1.7.3
     name: metadataretriever
   - image: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
     name: dell-connectivity-client

diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml
@@ -77,7 +77,7 @@ spec:
           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
+        - value: dellemc/csi-metadata-retriever:v1.7.3
           name: RELATED_IMAGE_metadataretriever
         - value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3
           name: RELATED_IMAGE_dell-connectivity-client

diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml
@@ -55,7 +55,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.7.2
+        image: dellemc/csi-metadata-retriever:v1.7.3
 
     # sdc-monitor is disabled by default, due to high CPU usage
       - name: sdc-monitor

diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml
@@ -226,7 +226,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.7.2
+        image: dellemc/csi-metadata-retriever:v1.7.3
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: false

diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml
@@ -260,7 +260,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.7.2
+        image: dellemc/csi-metadata-retriever:v1.7.3
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: false

diff --git a/config/samples/storage_v1_csm_powerstore.yaml b/config/samples/storage_v1_csm_powerstore.yaml
@@ -73,7 +73,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.7.2
+        image: dellemc/csi-metadata-retriever:v1.7.3
 
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor

diff --git a/config/samples/storage_v1_csm_unity.yaml b/config/samples/storage_v1_csm_unity.yaml
@@ -93,7 +93,7 @@ spec:
       - name: snapshotter
         image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
       - name: csi-metadata-retriever
-        image: dellemc/csi-metadata-retriever:v1.7.2
+        image: dellemc/csi-metadata-retriever:v1.7.3
       # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
       # Configure when the storageCapacity is set as "true"
       # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m

diff --git a/deploy/operator.yaml b/deploy/operator.yaml
@@ -46,6 +46,18 @@ rules:
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
+metadata:
+  name: dell-csm-operator-application-mobility-velero-server
+rules:
+- apiGroups:
+  - '*'
+  resources:
+  - '*'
+  verbs:
+  - '*'
+---
+apiVersion: rbac.authorization.k8s.io/v1
+kind: ClusterRole
 metadata:
   creationTimestamp: null
   name: dell-csm-operator-manager-role
@@ -1150,36 +1162,24 @@ subjects:
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: dell-csm-operator-manager-rolebinding
+  name: dell-csm-operator-application-mobility-velero-server-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: dell-csm-operator-manager-role
+  name: dell-csm-operator-application-mobility-velero-server
 subjects:
 - kind: ServiceAccount
   name: dell-csm-operator-manager-service-account
   namespace: dell-csm-operator
 ---
 apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: application-mobility-velero-server
-rules:
-- apiGroups:
-  - '*'
-  resources:
-  - '*'
-  verbs:
-  - '*'
----
-apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata:
-  name: application-mobility-velero-server-rolebinding
+  name: dell-csm-operator-manager-rolebinding
 roleRef:
   apiGroup: rbac.authorization.k8s.io
   kind: ClusterRole
-  name: application-mobility-velero-server
+  name: dell-csm-operator-manager-role
 subjects:
 - kind: ServiceAccount
   name: dell-csm-operator-manager-service-account
@@ -1247,16 +1247,71 @@ spec:
       control-plane: controller-manager
   template:
     metadata:
-      labels:
-        control-plane: controller-manager
       annotations:
         storage.dell.com/CSMVersion: v1.10.2
+      labels:
+        control-plane: controller-manager
     spec:
       containers:
       - args:
         - --leader-elect
         command:
         - /manager
+        env:
+        - name: RELATED_IMAGE_dell-csm-operator
+          value: docker.io/dellemc/dell-csm-operator:v1.5.1
+        - name: RELATED_IMAGE_csi-isilon
+          value: docker.io/dellemc/csi-isilon:v2.10.1
+        - name: RELATED_IMAGE_csi-powermax
+          value: docker.io/dellemc/csi-powermax:v2.10.1
+        - name: RELATED_IMAGE_csipowermax-reverseproxy
+          value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1
+        - name: RELATED_IMAGE_csi-powerstore
+          value: docker.io/dellemc/csi-powerstore:v2.10.1
+        - name: RELATED_IMAGE_csi-unity
+          value: docker.io/dellemc/csi-unity:v2.10.1
+        - name: RELATED_IMAGE_csi-vxflexos
+          value: docker.io/dellemc/csi-vxflexos:v2.10.1
+        - 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.1
+        - name: RELATED_IMAGE_dell-csi-replicator
+          value: docker.io/dellemc/dell-csi-replicator:v1.8.1
+        - name: RELATED_IMAGE_dell-replication-controller-manager
+          value: docker.io/dellemc/dell-replication-controller:v1.8.1
+        - name: RELATED_IMAGE_topology
+          value: docker.io/dellemc/csm-topology:v1.8.1
+        - 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.1
+        - name: RELATED_IMAGE_metrics-powermax
+          value: docker.io/dellemc/csm-metrics-powermax:v1.3.1
+        - name: RELATED_IMAGE_metrics-powerflex
+          value: docker.io/dellemc/csm-metrics-powerflex:v1.8.1
+        - name: RELATED_IMAGE_podmon-node
+          value: docker.io/dellemc/podmon:v1.9.1
+        - 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.3
+        - 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.1
         imagePullPolicy: Always
         livenessProbe:

diff --git a/operatorconfig/driverconfig/common/default.yaml b/operatorconfig/driverconfig/common/default.yaml
@@ -27,4 +27,4 @@ images:
   sdcmonitor: dellemc/sdc:4.5.1
 
   #"images.metadataretriever" defines the container images used for csi metadata retriever
-  metadataretriever: dellemc/csi-metadata-retriever:v1.7.2
+  metadataretriever: dellemc/csi-metadata-retriever:v1.7.3