From 8f51e1c259276b9ef283049a1e4f8da2776f4c97 Mon Sep 17 00:00:00 2001 From: Santhosh Lakshmanan <111809751+santhoshatdell@users.noreply.github.com> Date: Wed, 6 Sep 2023 11:39:29 -0500 Subject: [PATCH] Replication/Observability 1.6 updates for Installation Wizard (#830) --- .../templates/helm/csm-1.8.0-values.template | 12 ++++++------ .../operator/csm-isilon-1.8.0.template | 17 ++++++----------- .../operator/csm-powermax-1.8.0.template | 16 ++++++---------- 3 files changed, 18 insertions(+), 27 deletions(-) diff --git a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template index a5dc4e15a4..5b8f25d417 100644 --- a/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template +++ b/content/docs/deployment/csminstallationwizard/src/templates/helm/csm-1.8.0-values.template @@ -17,7 +17,7 @@ csi-powerstore: tolerations: $CONTROLLER_TOLERATIONS replication: enabled: $REPLICATION_ENABLED - image: dellemc/dell-csi-replicator:v1.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 vgsnapshot: enabled: $VG_SNAPSHOT_ENABLED image: dellemc/csi-volumegroup-snapshotter:v1.3.0 @@ -147,11 +147,11 @@ csi-powermax: deployAsSidecar: true replication: enabled: $REPLICATION_ENABLED - image: dellemc/dell-csi-replicator:v1.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 migration: enabled: $MIGRATION_ENABLED - image: dellemc/dell-csi-migrator:v1.1.1 - nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.0.1 + image: dellemc/dell-csi-migrator:v1.2.0 + nodeRescanSidecarImage: dellemc/dell-csi-node-rescanner:v1.1.0 authorization: enabled: $AUTHORIZATION_ENABLED sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.8.0 @@ -178,7 +178,7 @@ csi-vxflexos: controller: replication: enabled: $REPLICATION_ENABLED - image: dellemc/dell-csi-replicator:v1.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 healthMonitor: enabled: $HEALTH_MONITOR_ENABLED controllerCount: $CONTROLLER_COUNT @@ -282,7 +282,7 @@ csi-isilon: replication: enabled: $REPLICATION_ENABLED - image: dellemc/dell-csi-replicator:v1.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 snapshot: enabled: $SNAPSHOT_ENABLED diff --git a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template index d8195d2f83..aedba807ba 100644 --- a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template +++ b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-isilon-1.8.0.template @@ -267,13 +267,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: $REPLICATION_ENABLED - configVersion: v1.5.0 + configVersion: v1.6.0 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.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -289,7 +289,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.5.0 + image: dellemc/dell-replication-controller:v1.6.0 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 @@ -317,23 +317,18 @@ spec: - name: "RETRY_INTERVAL_MAX" value: "5m" - - name: dell-replication-controller-init - # image: Defines replication init container image. This shouldn't be changed - # Allowed values: string - image: dellemc/dell-replication-init:v1.0.1 - # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability enabled: $OBSERVABILITY_OPERATOR_ENABLED - configVersion: v1.5.0 + configVersion: v1.6.0 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.5.0 + image: dellemc/csm-topology:v1.6.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -367,7 +362,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.2.0 + image: dellemc/csm-metrics-powerscale:v1.3.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template index ffa230fe12..573d9e31fc 100644 --- a/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template +++ b/content/docs/deployment/csminstallationwizard/src/templates/operator/csm-powermax-1.8.0.template @@ -274,13 +274,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: $REPLICATION_ENABLED - configVersion: v1.5.0 + configVersion: v1.6.0 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.5.0 + image: dellemc/dell-csi-replicator:v1.6.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -296,7 +296,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.5.0 + image: dellemc/dell-replication-controller:v1.6.0 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 @@ -323,22 +323,18 @@ spec: - name: "RETRY_INTERVAL_MAX" value: "5m" - - name: dell-replication-controller-init - # image: Defines replication init container image. This shouldn't be changed - # Allowed values: string - image: dellemc/dell-replication-init:v1.0.1 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability enabled: $OBSERVABILITY_OPERATOR_ENABLED - configVersion: v1.5.0 + configVersion: v1.6.0 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.5.0 + image: dellemc/csm-topology:v1.6.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -363,7 +359,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.0.0 + image: dellemc/csm-metrics-powermax:v1.1.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int