Merge branch 'main' into fc-nvme-doc-updates

dell · Oct 28, 2024 · 4054d73 · 4054d73
2 parents b4c3720 + 3394e55
commit 4054d73
Show file tree

Hide file tree

Showing 9 changed files with 125 additions and 32 deletions.
diff --git a/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.10.2.template b/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.10.2.template
@@ -229,10 +229,22 @@ spec:
 
     sideCars:
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+      - name: csi-metadata-retriever
+        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: $HEALTH_MONITOR_ENABLED
+        image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
         args: ["--monitor-interval=60s"]
       # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
       # Configure when the storageCapacity is set as "true"
@@ -245,10 +257,10 @@ spec:
     - name: authorization
       # enable: Enable/Disable csm-authorization
       enabled: $AUTHORIZATION_ENABLED
-      configVersion: v1.10.0
+      configVersion: v1.10.1
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.10.0
+        image: dellemc/csm-authorization-sidecar:v1.10.1
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"
@@ -267,13 +279,13 @@ spec:
       #   false: disable replication feature(do not install dell-csi-replicator sidecar)
       # Default value: false
       enabled: $REPLICATION_ENABLED
-      configVersion: v1.8.0
+      configVersion: v1.8.1
       components:
       - name: dell-csi-replicator
         # image: Image to use for dell-csi-replicator. This shouldn't be changed
         # Allowed values: string
         # Default value: None
-        image: dellemc/dell-csi-replicator:v1.8.0
+        image: dellemc/dell-csi-replicator:v1.8.1
         envs:
           # replicationPrefix: prefix to prepend to storage classes parameters
           # Allowed values: string
@@ -289,7 +301,7 @@ spec:
       - name: dell-replication-controller-manager
         # image: Defines controller image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/dell-replication-controller:v1.7.0
+        image: dellemc/dell-replication-controller:v1.8.1
         envs:
           # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
           # Set the value to "self" in case of stretched/single cluster configuration
@@ -321,14 +333,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: $OBSERVABILITY_OPERATOR_ENABLED
-      configVersion: v1.7.0
+      configVersion: v1.8.1
       components:
         - name: topology
           # enabled: Enable/Disable topology
           enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
           # image: Defines karavi-topology image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-topology:v1.7.0
+          image: dellemc/csm-topology:v1.8.1
           envs:
             # topology log level
             # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -362,7 +374,7 @@ spec:
           enabled: $OBSERVABILITY_OPERATOR_METRICS
           # image: Defines PowerScale metrics image. This shouldn't be changed
           # Allowed values: string
-          image: dellemc/csm-metrics-powerscale:v1.4.0
+          image: dellemc/csm-metrics-powerscale:v1.5.1
           envs:
             # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale
             # Allowed values: int
@@ -431,10 +443,10 @@ spec:
       #   false: disable Resiliency feature(do not deploy podmon sidecar)
       # Default value: false
       enabled: $OPERATOR_RESILIENCY_ENABLED
-      configVersion: v1.8.0
+      configVersion: v1.9.1
       components:
         - name: podmon-controller
-          image: dellemc/podmon:v1.9.0
+          image: dellemc/podmon:v1.9.1
           imagePullPolicy: IfNotPresent
           args:
             - "--labelvalue=$LABEL_VALUE"
@@ -449,7 +461,7 @@ spec:
             - "--driverPath=csi-isilon.dellemc.com"
             - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
         - name: podmon-node
-          image: dellemc/podmon:v1.9.0
+          image: dellemc/podmon:v1.9.1
           imagePullPolicy: IfNotPresent
           envs:
             # podmonAPIPort: Defines the port to be used within the kubernetes cluster

diff --git a/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template b/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.11.0.template
@@ -243,7 +243,18 @@ spec:
 
     sideCars:
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
+      - name: csi-metadata-retriever
+        image: dellemc/csi-metadata-retriever:v1.8.0
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: $HEALTH_MONITOR_ENABLED

diff --git a/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.12.0.template b/...t/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.12.0.template
@@ -39,7 +39,7 @@ spec:
     forceRemoveDriver: true
     common:
       # Image for CSI PowerScale driver v2.12.0
-      image: "dellemc/csi-isilon:v2.12.0"
+      image: "quay.io/dell/container-storage-modules/csi-isilon:v2.12.0"
       imagePullPolicy: IfNotPresent
       envs:
         # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs
@@ -243,11 +243,23 @@ spec:
 
     sideCars:
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
       # health monitor is disabled by default, refer to driver documentation before enabling it
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
+      - name: csi-metadata-retriever
+        image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
       - name: external-health-monitor
         enabled: $HEALTH_MONITOR_ENABLED
         args: ["--monitor-interval=60s"]
+        image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0
       # 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
@@ -448,7 +460,7 @@ spec:
       configVersion: v1.11.0
       components:
         - name: podmon-controller
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           args:
             - "--labelvalue=$LABEL_VALUE"
@@ -463,7 +475,7 @@ spec:
             - "--driverPath=csi-isilon.dellemc.com"
             - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml"
         - name: podmon-node
-          image: dellemc/podmon:v1.11.0
+          image: quay.io/dell/container-storage-modules/podmon:v1.11.0
           imagePullPolicy: IfNotPresent
           envs:
             # podmonAPIPort: Defines the port to be used within the kubernetes cluster

diff --git a/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.10.2.template b/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.10.2.template
@@ -232,14 +232,14 @@ spec:
     - name: csireverseproxy
       # enabled: Always set to true
       enabled: true
-      configVersion: v2.9.0
+      configVersion: v2.9.1
       forceRemoveModule: true
       components:
       - name: csipowermax-reverseproxy
       # image: Define the container images used for the reverse proxy
       # Default value: None
-      # Example: "csipowermax-reverseproxy:v2.9.0"
-        image: dellemc/csipowermax-reverseproxy:v2.9.0
+      # Example: "csipowermax-reverseproxy:v2.9.1"
+        image: dellemc/csipowermax-reverseproxy:v2.9.1
         envs:
           # "tlsSecret" defines the TLS secret that is created with certificate
           # and its associated key
@@ -256,10 +256,10 @@ spec:
     - name: authorization
       # enabled: Enable/Disable csm-authorization
       enabled: $AUTHORIZATION_ENABLED
-      configVersion: v1.9.0
+      configVersion: v1.10.1
       components:
       - name: karavi-authorization-proxy
-        image: dellemc/csm-authorization-sidecar:v1.10.0
+        image: dellemc/csm-authorization-sidecar:v1.10.1
         envs:
           # proxyHost: hostname of the csm-authorization server
           - name: "PROXY_HOST"
@@ -277,13 +277,13 @@ spec:
       #   false: disable replication feature(do not install dell-csi-replicator sidecar)
       # Default value: false
       enabled: $REPLICATION_ENABLED
-      configVersion: v1.8.0
+      configVersion: v1.8.1
       components:
       - name: dell-csi-replicator
         # image: Image to use for dell-csi-replicator. This shouldn't be changed
         # Allowed values: string
         # Default value: None
-        image: dellemc/dell-csi-replicator:v1.8.0
+        image: dellemc/dell-csi-replicator:v1.8.1
         envs:
           # replicationPrefix: prefix to prepend to storage classes parameters
           # Allowed values: string
@@ -299,7 +299,7 @@ spec:
       - name: dell-replication-controller-manager
         # image: Defines controller image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/dell-replication-controller:v1.7.0
+        image: dellemc/dell-replication-controller:v1.8.1
         envs:
           # TARGET_CLUSTERS_IDS: comma separated list of cluster IDs of the targets clusters. DO NOT include the source(wherever CSM Operator is deployed) cluster ID
           # Set the value to "self" in case of stretched/single cluster configuration
@@ -330,14 +330,14 @@ spec:
     - name: observability
       # enabled: Enable/Disable observability
       enabled: $OBSERVABILITY_OPERATOR_ENABLED
-      configVersion: v1.7.0
+      configVersion: v1.8.1
       components:
       - name: topology
         # enabled: Enable/Disable topology
         enabled: $OBSERVABILITY_OPERATOR_TOPOLOGY
         # image: Defines karavi-topology image. This shouldn't be changed
         # Allowed values: string
-        image: dellemc/csm-topology:v1.7.0
+        image: dellemc/csm-topology:v1.8.1
         envs:
           # topology log level
           # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC
@@ -362,7 +362,7 @@ spec:
         # enabled: Enable/Disable PowerMax metrics
         enabled: $OBSERVABILITY_OPERATOR_METRICS
         # image: Defines PowerMax metrics image. This shouldn't be changed
-        image: dellemc/csm-metrics-powermax:v1.2.0
+        image: dellemc/csm-metrics-powermax:v1.3.1
         envs:
           # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax
           # Allowed values: int

diff --git a/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template b/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.11.0.template
@@ -216,12 +216,23 @@ spec:
     sideCars:
       # 'pmax' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
+      - name: csi-metadata-retriever
+        image: dellemc/csi-metadata-retriever:v1.8.0
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: $HEALTH_MONITOR_ENABLED
         args: [ "--monitor-interval=60s" ]
-      
+
       # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
       # Configure only when the storageCapacity is set as "true"
       # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m

diff --git a/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.12.0.template b/...docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.12.0.template
@@ -216,7 +216,18 @@ spec:
     sideCars:
       # 'pmax' represents a string prepended to each volume created by the CSI driver
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.12.0
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.12.0
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.1.0
+      - name: csi-metadata-retriever
+        image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: $HEALTH_MONITOR_ENABLED
@@ -240,7 +251,7 @@ spec:
       # image: Define the container images used for the reverse proxy
       # Default value: None
       # Example: "csipowermax-reverseproxy:v2.11.0"
-        image: dellemc/csipowermax-reverseproxy:v2.11.0
+        image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0
         envs:
           # "tlsSecret" defines the TLS secret that is created with certificate
           # and its associated key

diff --git a/...cs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.10.2.template b/...cs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.10.2.template
@@ -58,11 +58,23 @@ spec:
 
     sideCars:
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1
+      - name: csi-metadata-retriever
+        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: $HEALTH_MONITOR_ENABLED
         args: ["--monitor-interval=60s"]
+        image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0
 
       # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
       # Configure only when the storageCapacity is set as "true"
@@ -159,7 +171,7 @@ spec:
       configVersion: v1.9.0
       components:
         - name: podmon-controller
-          image: dellemc/podmon:v1.9.0
+          image: dellemc/podmon:v1.9.1
           imagePullPolicy: IfNotPresent
           args:
             - "--labelvalue=$LABEL_VALUE"
@@ -174,7 +186,7 @@ spec:
             - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml"
             - "--driverPath=csi-powerstore.dellemc.com"
         - name: podmon-node
-          image: dellemc/podmon:v1.9.0
+          image: dellemc/podmon:v1.9.1
           imagePullPolicy: IfNotPresent
           envs:
             # podmonAPIPort: Defines the port to be used within the kubernetes cluster

diff --git a/...cs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template b/...cs/deployment/csminstallationwizard/src/templates/operator/csm-powerstore-1.11.0.template
@@ -58,11 +58,23 @@ spec:
 
     sideCars:
       - name: provisioner
+        image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1
         args: ["--volume-name-prefix=$VOLUME_NAME_PREFIX"]
+      - name: attacher
+        image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1
+      - name: registrar
+        image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1
+      - name: resizer
+        image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1
+      - name: snapshotter
+        image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1
+      - name: csi-metadata-retriever
+        image: dellemc/csi-metadata-retriever:v1.8.0
       # health monitor is disabled by default, refer to driver documentation before enabling it
       - name: external-health-monitor
         enabled: $HEALTH_MONITOR_ENABLED
         args: ["--monitor-interval=60s"]
+        image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.12.1
 
       # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity
       # Configure only when the storageCapacity is set as "true"