From aeb7656fc38a8aaec325ee2cb0d017ba00047260 Mon Sep 17 00:00:00 2001 From: nitesh3108 Date: Wed, 16 Oct 2024 08:27:02 -0400 Subject: [PATCH 1/9] refer quay.io --- charts/csi-isilon/values.yaml | 10 ++-- .../charts/csireverseproxy/values.yaml | 2 +- charts/csi-powermax/values.yaml | 16 +++--- charts/csi-powerstore/values.yaml | 10 ++-- charts/csi-unity/values.yaml | 4 +- charts/csi-vxflexos/values.yaml | 10 ++-- charts/csm-authorization-v2.0/values.yaml | 10 ++-- charts/csm-authorization/values.yaml | 8 +-- charts/csm-replication/values.yaml | 2 +- charts/karavi-observability/values.yaml | 22 ++++---- .../container-storage-modules/values.yaml | 52 +++++++++---------- 11 files changed, 73 insertions(+), 73 deletions(-) diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml index 1686e87e..ebbf0780 100644 --- a/charts/csi-isilon/values.yaml +++ b/charts/csi-isilon/values.yaml @@ -7,7 +7,7 @@ version: "v2.11.0" images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-isilon:v2.11.0 + image: quay.io/dell/container-storage-modules/csi-isilon::v2.11.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -24,13 +24,13 @@ images: # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 metadataretriever: - image: dellemc/csi-metadata-retriever:v1.8.0 + image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0 # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index 3b6541b7..e76fd9b6 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -1,4 +1,4 @@ -image: dellemc/csipowermax-reverseproxy:v2.10.0 +image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 port: 2222 # TLS secret which is used for setting up the proxy HTTPS server diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 963ef614..62772619 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -55,9 +55,9 @@ version: "v2.11.0" images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-powermax:v2.11.0 + image: quay.io/dell/container-storage-modules/csi-powermax:v2.11.0 csireverseproxy: - image: dellemc/csipowermax-reverseproxy:v2.10.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -73,17 +73,17 @@ images: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 migration: - image: dellemc/dell-csi-migrator:v1.5.0 + image: quay.io/dell/container-storage-modules/dell-csi-migrator:v1.5.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 # Node rescan sidecar does a rescan on nodes for identifying new paths - # Default value: dellemc/dell-csi-node-rescanner:v1.4.0 + # Default value: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.4.0 noderescan: - image: dellemc/dell-csi-node-rescanner:v1.4.0 + image: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.4.0 ## K8S/DRIVER ATTRIBUTES ######################## # customDriverName: If enabled, sets the driver name to the diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml index ed914d5b..1fca4463 100644 --- a/charts/csi-powerstore/values.yaml +++ b/charts/csi-powerstore/values.yaml @@ -30,7 +30,7 @@ version: v2.11.0 images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-powerstore:v2.11.1 + image: quay.io/dell/container-storage-modules/csi-powerstore:v2.11.1 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -47,13 +47,13 @@ images: # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.9.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.9.0 vgsnapshotter: - image: dellemc/csi-volumegroup-snapshotter:v1.7.0 + image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.7.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 metadataretriever: - image: dellemc/csi-metadata-retriever:v1.8.0 + image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0 # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. diff --git a/charts/csi-unity/values.yaml b/charts/csi-unity/values.yaml index 7c0bee01..38d237d6 100644 --- a/charts/csi-unity/values.yaml +++ b/charts/csi-unity/values.yaml @@ -9,7 +9,7 @@ version: "v2.12.0" images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-unity:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-unity:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -26,7 +26,7 @@ images: # CSM sidecars podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 # LogLevel is used to set the logging level of the driver. # Allowed values: "error", "warn"/"warning", "info", "debug" diff --git a/charts/csi-vxflexos/values.yaml b/charts/csi-vxflexos/values.yaml index 32e5b194..b708b88f 100644 --- a/charts/csi-vxflexos/values.yaml +++ b/charts/csi-vxflexos/values.yaml @@ -11,7 +11,7 @@ version: v2.12.0 images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-vxflexos:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0 # "powerflexSdc" defines the SDC image for init container. powerflexSdc: image: dellemc/sdc:4.5.2.1 @@ -30,13 +30,13 @@ images: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 vgsnapshotter: - image: dellemc/csi-volumegroup-snapshotter:v1.7.0 + image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.7.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 # Represents number of certificate secrets, which user is going to create for ssl authentication. (vxflexos-cert-0..vxflexos-cert-n) # If user does not use certificate, set to 0 diff --git a/charts/csm-authorization-v2.0/values.yaml b/charts/csm-authorization-v2.0/values.yaml index e1a985b3..c8aeaa6d 100644 --- a/charts/csm-authorization-v2.0/values.yaml +++ b/charts/csm-authorization-v2.0/values.yaml @@ -19,15 +19,15 @@ authorization: # images to use in installation images: proxyService: - image: dellemc/csm-authorization-proxy:v2.0.0-alpha + image: quay.io/dell/container-storage-modules/csm-authorization-proxy:v2.0.0-alpha tenantService: - image: dellemc/csm-authorization-tenant:v2.0.0-alpha + image: quay.io/dell/container-storage-modules/csm-authorization-tenant:v2.0.0-alpha roleService: - image: dellemc/csm-authorization-role:v2.0.0-alpha + image: quay.io/dell/container-storage-modules/csm-authorization-role:v2.0.0-alpha storageService: - image: dellemc/csm-authorization-storage:v2.0.0-alpha + image: quay.io/dell/container-storage-modules/csm-authorization-storage:v2.0.0-alpha authorizationController: - image: dellemc/csm-authorization-controller:v2.0.0-alpha + image: quay.io/dell/container-storage-modules/csm-authorization-controller:v2.0.0-alpha opa: image: openpolicyagent/opa opaKubeMgmt: diff --git a/charts/csm-authorization/values.yaml b/charts/csm-authorization/values.yaml index 00fb36f3..94b1b08b 100644 --- a/charts/csm-authorization/values.yaml +++ b/charts/csm-authorization/values.yaml @@ -13,13 +13,13 @@ authorization: # images to use in installation images: proxyService: - image: dellemc/csm-authorization-proxy:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-proxy:v1.11.0 tenantService: - image: dellemc/csm-authorization-tenant:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-tenant:v1.11.0 roleService: - image: dellemc/csm-authorization-role:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-role:v1.11.0 storageService: - image: dellemc/csm-authorization-storage:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-storage:v1.11.0 opa: image: openpolicyagent/opa opaKubeMgmt: diff --git a/charts/csm-replication/values.yaml b/charts/csm-replication/values.yaml index 4f1bdd3d..e62b6e88 100644 --- a/charts/csm-replication/values.yaml +++ b/charts/csm-replication/values.yaml @@ -5,7 +5,7 @@ replicas: 1 # image: Defines controller image. This shouldn't be changed # Allowed values: string -image: dellemc/dell-replication-controller:v1.9.0 +image: quay.io/dell/container-storage-modules/dell-replication-controller:v1.9.0 # logLevel: Defines initial log level for controller. This can be changed in runtime # Allowed values: "debug", "info", "warn", "error", "panic" diff --git a/charts/karavi-observability/values.yaml b/charts/karavi-observability/values.yaml index 2ebc6153..e25b361b 100644 --- a/charts/karavi-observability/values.yaml +++ b/charts/karavi-observability/values.yaml @@ -1,5 +1,5 @@ karaviTopology: - image: dellemc/csm-topology:v1.10.0 + image: quay.io/dell/container-storage-modules/csm-topology:v1.10.0 enabled: true # comma separated list of provisioner names (ex: csi-vxflexos.dellemc.com) provisionerNames: csi-vxflexos.dellemc.com,csi-powerstore.dellemc.com,csi-isilon.dellemc.com,csi-powermax.dellemc.com @@ -13,7 +13,7 @@ karaviTopology: probability: 0.0 karaviMetricsPowerflex: - image: dellemc/csm-metrics-powerflex:v1.10.0 + image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-vxflexos.dellemc.com) @@ -40,9 +40,9 @@ karaviMetricsPowerflex: authorization: enabled: false # sidecarProxy.image: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.10.1 + # Default value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.10.1 sidecarProxy: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -54,7 +54,7 @@ karaviMetricsPowerflex: skipCertificateValidation: true karaviMetricsPowerstore: - image: dellemc/csm-metrics-powerstore:v1.10.0 + image: quay.io/dell/container-storage-modules/csm-metrics-powerstore:v1.10.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-powerstore.dellemc.com) @@ -80,7 +80,7 @@ karaviMetricsPowerstore: probability: 0.0 karaviMetricsPowerscale: - image: dellemc/csm-metrics-powerscale:v1.7.0 + image: quay.io/dell/container-storage-modules/csm-metrics-powerscale:v1.7.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-isilon.dellemc.com) @@ -117,9 +117,9 @@ karaviMetricsPowerscale: authorization: enabled: false # sidecarProxy.image: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.10.1 + # Default value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.10.1 sidecarProxy: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: @@ -131,7 +131,7 @@ karaviMetricsPowerscale: skipCertificateValidation: true karaviMetricsPowermax: - image: dellemc/csm-metrics-powermax:v1.5.0 + image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0 enabled: true collectorAddr: otel-collector:55680 # comma separated list of provisioner names (ex: csi-powermax.dellemc.com) @@ -155,9 +155,9 @@ karaviMetricsPowermax: authorization: enabled: false # sidecarProxy.image: the container image used for the csm-authorization-sidecar. - # Default value: dellemc/csm-authorization-sidecar:v1.10.1 + # Default value: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.10.1 sidecarProxy: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 # proxyHost: hostname of the csm-authorization server # Default value: None proxyHost: diff --git a/installation-wizard/container-storage-modules/values.yaml b/installation-wizard/container-storage-modules/values.yaml index 747ccd97..b30dedc6 100644 --- a/installation-wizard/container-storage-modules/values.yaml +++ b/installation-wizard/container-storage-modules/values.yaml @@ -24,7 +24,7 @@ csi-powerstore: images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-powerstore:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -41,13 +41,13 @@ csi-powerstore: # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 vgsnapshotter: - image: dellemc/csi-volumegroup-snapshotter:v1.7.0 + image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.7.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 metadataretriever: - image: dellemc/csi-metadata-retriever:v1.8.0 + image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0 ## Controller ATTRIBUTES controller: controllerCount: 2 @@ -144,9 +144,9 @@ csi-powermax: images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-powermax:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 csireverseproxy: - image: dellemc/csipowermax-reverseproxy:v2.10.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -162,17 +162,17 @@ csi-powermax: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 migration: - image: dellemc/dell-csi-migrator:v1.5.0 + image: quay.io/dell/container-storage-modules/dell-csi-migrator:v1.5.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 # Node rescan sidecar does a rescan on nodes for identifying new paths - # Default value: dellemc/dell-csi-node-rescanner:v1.4.0 + # Default value: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.4.0 noderescan: - image: dellemc/dell-csi-node-rescanner:v1.4.0 + image: quay.io/dell/container-storage-modules/dell-csi-node-rescanner:v1.4.0 clusterPrefix: ABC portGroups: PortGroup1, PortGroup2, PortGroup3 controller: @@ -215,7 +215,7 @@ csi-isilon: images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-isilon:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -231,13 +231,13 @@ csi-isilon: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 metadataretriever: - image: dellemc/csi-metadata-retriever:v1.8.0 + image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.8.0 ## Controller ATTRIBUTES controller: controllerCount: 2 @@ -314,7 +314,7 @@ csi-vxflexos: images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-vxflexos:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0 # "powerflexSdc" defines the SDC image for init container. powerflexSdc: image: dellemc/sdc:4.5.2.1 @@ -333,13 +333,13 @@ csi-vxflexos: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars replication: - image: dellemc/dell-csi-replicator:v1.10.0 + image: quay.io/dell/container-storage-modules/dell-csi-replicator:v1.10.0 vgsnapshotter: - image: dellemc/csi-volumegroup-snapshotter:v1.7.0 + image: quay.io/dell/container-storage-modules/csi-volumegroup-snapshotter:v1.7.0 podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 authorization: - image: dellemc/csm-authorization-sidecar:v1.11.0 + image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 certSecretCount: 0 controller: replication: @@ -414,7 +414,7 @@ csi-vxflexos: - "--ignoreVolumelessPods=false" authorization: enabled: false - sidecarProxyImage: dellemc/csm-authorization-sidecar:v1.11.0 + sidecarProxyImage: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.11.0 proxyHost: ## CSI Unity @@ -425,7 +425,7 @@ csi-unity: images: # "driver" defines the container image, used for the driver container. driver: - image: dellemc/csi-unity:v2.12.0 + image: quay.io/dell/container-storage-modules/csi-unity:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -441,7 +441,7 @@ csi-unity: image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.13.0 # CSM sidecars podmon: - image: dellemc/podmon:v1.11.0 + image: quay.io/dell/container-storage-modules/podmon:v1.11.0 # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (unity-cert-0..unity-cert-n) # Allowed values: n, where n > 0 From 26094ae558584693c35a180de44a55b64c877657 Mon Sep 17 00:00:00 2001 From: nitesh3108 Date: Thu, 17 Oct 2024 07:13:22 -0400 Subject: [PATCH 2/9] fix --- charts/csi-isilon/values.yaml | 2 +- charts/csm-replication/templates/controller.yaml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml index ebbf0780..3ec8c2dc 100644 --- a/charts/csi-isilon/values.yaml +++ b/charts/csi-isilon/values.yaml @@ -7,7 +7,7 @@ version: "v2.11.0" images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-isilon::v2.11.0 + image: quay.io/dell/container-storage-modules/csi-isilon:v2.11.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 diff --git a/charts/csm-replication/templates/controller.yaml b/charts/csm-replication/templates/controller.yaml index 4fc19d96..d5204cb7 100644 --- a/charts/csm-replication/templates/controller.yaml +++ b/charts/csm-replication/templates/controller.yaml @@ -1,3 +1,4 @@ +--- apiVersion: v1 kind: ServiceAccount metadata: From da49660bbf93056e91ddd21805c65e97a71e45f6 Mon Sep 17 00:00:00 2001 From: nitesh3108 Date: Thu, 17 Oct 2024 07:27:07 -0400 Subject: [PATCH 3/9] fix lint --- charts/csm-replication/templates/controller.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/charts/csm-replication/templates/controller.yaml b/charts/csm-replication/templates/controller.yaml index d5204cb7..0db2844c 100644 --- a/charts/csm-replication/templates/controller.yaml +++ b/charts/csm-replication/templates/controller.yaml @@ -1,4 +1,3 @@ ---- apiVersion: v1 kind: ServiceAccount metadata: @@ -313,4 +312,4 @@ spec: - configMap: name: dell-replication-controller-config optional: true - name: configmap-volume \ No newline at end of file + name: configmap-volume From 366e4772e855a7c290657b0d01f3537f000c1412 Mon Sep 17 00:00:00 2001 From: shefali-malhotra Date: Fri, 18 Oct 2024 00:17:56 -0400 Subject: [PATCH 4/9] fixing yaml lint issues --- charts/csm-replication/templates/controller.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/csm-replication/templates/controller.yaml b/charts/csm-replication/templates/controller.yaml index 0db2844c..2410afbc 100644 --- a/charts/csm-replication/templates/controller.yaml +++ b/charts/csm-replication/templates/controller.yaml @@ -208,12 +208,12 @@ subjects: name: dell-replication-controller-sa namespace: {{ .Release.Namespace }} --- -{{- $secret := (lookup "v1" "ConfigMap" "{{ .Release.Namespace }}" "dell-replication-controller-config").data -}} apiVersion: v1 kind: ConfigMap metadata: name: dell-replication-controller-config namespace: {{ .Release.Namespace }} +{{- $secret := (lookup "v1" "ConfigMap" "{{ .Release.Namespace }}" "dell-replication-controller-config").data -}} {{ if $secret -}} data: {{- range $key, $value := $secret }} From 873d1ae0e1c22886e761c9bd89d87bbcb4f298cb Mon Sep 17 00:00:00 2001 From: nitesh3108 Date: Fri, 18 Oct 2024 01:12:53 -0400 Subject: [PATCH 5/9] remove csm-installer --- charts/csm-installer/Chart.yaml | 6 - charts/csm-installer/README.md | 19 -- .../csm-installer/templates/certificates.yaml | 30 --- .../csm-installer/templates/cluster-init.yaml | 47 ---- .../csm-installer/templates/cockroach-db.yaml | 219 ------------------ .../templates/csm-installer.yaml | 170 -------------- charts/csm-installer/templates/secrets.yaml | 13 -- charts/csm-installer/values.yaml | 59 ----- 8 files changed, 563 deletions(-) delete mode 100644 charts/csm-installer/Chart.yaml delete mode 100644 charts/csm-installer/README.md delete mode 100644 charts/csm-installer/templates/certificates.yaml delete mode 100644 charts/csm-installer/templates/cluster-init.yaml delete mode 100644 charts/csm-installer/templates/cockroach-db.yaml delete mode 100644 charts/csm-installer/templates/csm-installer.yaml delete mode 100644 charts/csm-installer/templates/secrets.yaml delete mode 100644 charts/csm-installer/values.yaml diff --git a/charts/csm-installer/Chart.yaml b/charts/csm-installer/Chart.yaml deleted file mode 100644 index 14f65332..00000000 --- a/charts/csm-installer/Chart.yaml +++ /dev/null @@ -1,6 +0,0 @@ -apiVersion: v2 -name: csm-installer -version: 1.0.2 -appVersion: 1.0.2 -type: application -description: Dell EMC Container Storage Modules Installer diff --git a/charts/csm-installer/README.md b/charts/csm-installer/README.md deleted file mode 100644 index b884cd8a..00000000 --- a/charts/csm-installer/README.md +++ /dev/null @@ -1,19 +0,0 @@ - - -# Dell Community Helm Chart for Dell EMC Container Storage Modules (CSM) - -Dell EMC Container Storage Modules (CSM) can be deployed using Helm. - -For complete deployment instructions, refer to the [Dell EMC Container Storage Modules (CSM) Github repository](https://github.com/dell/csm). - -## Helm Chart Versioning - -For an explanation and examples on versioning/releasing the helm chart, please see the [contributing guide](../../docs/CONTRIBUTING.md#helm-chart-release-strategy). diff --git a/charts/csm-installer/templates/certificates.yaml b/charts/csm-installer/templates/certificates.yaml deleted file mode 100644 index 00237953..00000000 --- a/charts/csm-installer/templates/certificates.yaml +++ /dev/null @@ -1,30 +0,0 @@ -{{ if eq .Values.scheme "https" }} -apiVersion: v1 -data: - tls.crt: {{ required "A valid serviceCertificate is required" .Values.serviceCertificate | b64enc }} - tls.key: {{ required "A valid servicePrivateKey is required" .Values.servicePrivateKey | b64enc }} -kind: Secret -metadata: - name: dell-csm-installer-service-certificates ---- -{{ end }} - -{{ if eq .Values.dbSSLEnabled "true" }} -apiVersion: v1 -data: - tls.crt: {{ required "A valid dbClientCertificate is required" .Values.dbClientCertificate | b64enc }} - tls.key: {{ required "A valid dbClientPrivateKey is required" .Values.dbClientPrivateKey | b64enc }} - ca.crt: {{ required "A valid caCrt is required" .Values.caCrt | b64enc }} -kind: Secret -metadata: - name: dell-csm-installer-dbclient-certificates ---- -apiVersion: v1 -data: - ca.crt: {{ required "A valid caCrt is required" .Values.caCrt | b64enc }} - tls.crt: {{ required "A valid databaseCertificate is required" .Values.databaseCertificate | b64enc }} - tls.key: {{ required "A valid databasePrivateKey is required" .Values.databasePrivateKey | b64enc }} -kind: Secret -metadata: - name: dell-csm-installer-database-certificates -{{ end }} diff --git a/charts/csm-installer/templates/cluster-init.yaml b/charts/csm-installer/templates/cluster-init.yaml deleted file mode 100644 index ea2cd4ba..00000000 --- a/charts/csm-installer/templates/cluster-init.yaml +++ /dev/null @@ -1,47 +0,0 @@ -apiVersion: batch/v1 -kind: Job -metadata: - name: cluster-init - labels: - app: cockroachdb -spec: - template: - spec: - {{ if eq .Values.dbSSLEnabled "true" }} - volumes: - - name: dell-csm-installer-dbclient-certificates - secret: - secretName: dell-csm-installer-dbclient-certificates - items: - - key: tls.crt - path: client.root.crt - mode: 0700 - - key: tls.key - path: client.root.key - mode: 0700 - - key: ca.crt - path: ca.crt - mode: 0700 - {{ end }} - containers: - - name: cluster-init - env: - - name: COCKROACH_SKIP_KEY_PERMISSION_CHECK - value: "true" - image: cockroachdb/cockroach:v21.1.6 - imagePullPolicy: {{ .Values.imagePullPolicy }} - command: - - "/cockroach/cockroach" - - "init" - {{- if eq .Values.dbSSLEnabled "true" }} - - "--certs-dir=/cockroach/dbclient-certificates" - {{- else }} - - "--insecure" - {{- end }} - - "--host=cockroachdb-0.cockroachdb" - {{ if eq .Values.dbSSLEnabled "true" }} - volumeMounts: - - name: dell-csm-installer-dbclient-certificates - mountPath: /cockroach/dbclient-certificates - {{ end }} - restartPolicy: OnFailure diff --git a/charts/csm-installer/templates/cockroach-db.yaml b/charts/csm-installer/templates/cockroach-db.yaml deleted file mode 100644 index d215bffe..00000000 --- a/charts/csm-installer/templates/cockroach-db.yaml +++ /dev/null @@ -1,219 +0,0 @@ -apiVersion: v1 -kind: Service -metadata: - # This service is meant to be used by clients of the database. It exposes a ClusterIP that will - # automatically load balance connections to the different database pods. - name: cockroachdb-public - labels: - app: cockroachdb -spec: - ports: - # The main port, served by gRPC, serves Postgres-flavor SQL, internode - # traffic and the cli. - - port: 26257 - targetPort: 26257 - name: grpc - # The secondary port serves the UI as well as health and debug endpoints. - - port: 8080 - targetPort: 8080 - name: http - selector: - app: cockroachdb ---- -apiVersion: v1 -kind: Service -metadata: - # This service only exists to create DNS entries for each pod in the stateful - # set such that they can resolve each other's IP addresses. It does not - # create a load-balanced ClusterIP and should not be used directly by clients - # in most circumstances. - name: cockroachdb - labels: - app: cockroachdb - annotations: - # Use this annotation in addition to the actual publishNotReadyAddresses - # field below because the annotation will stop being respected soon but the - # field is broken in some versions of Kubernetes: - # https://github.com/kubernetes/kubernetes/issues/58662 - service.alpha.kubernetes.io/tolerate-unready-endpoints: "true" - # Enable automatic monitoring of all instances when Prometheus is running in the cluster. - prometheus.io/scrape: "true" - prometheus.io/path: "_status/vars" - prometheus.io/port: "8080" -spec: - ports: - - port: 26257 - targetPort: 26257 - name: grpc - - port: 8080 - targetPort: 8080 - name: http - # We want all pods in the StatefulSet to have their addresses published for - # the sake of the other CockroachDB pods even before they're ready, since they - # have to be able to talk to each other in order to become ready. - publishNotReadyAddresses: true - clusterIP: None - selector: - app: cockroachdb ---- -apiVersion: policy/v1beta1 -kind: PodDisruptionBudget -metadata: - name: cockroachdb-budget - labels: - app: cockroachdb -spec: - selector: - matchLabels: - app: cockroachdb - maxUnavailable: 1 ---- -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: cockroachdb -spec: - serviceName: "cockroachdb" - replicas: {{ required "Must provide the number of db instances to create." .Values.dbInstanceCount }} - selector: - matchLabels: - app: cockroachdb - template: - metadata: - labels: - app: cockroachdb - spec: - affinity: - podAntiAffinity: - preferredDuringSchedulingIgnoredDuringExecution: - - weight: 100 - podAffinityTerm: - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - cockroachdb - topologyKey: kubernetes.io/hostname - containers: - - name: cockroachdb - image: cockroachdb/cockroach:v21.1.7 - imagePullPolicy: {{ .Values.imagePullPolicy }} - # TODO: Change these to appropriate values for the hardware that you're running. You can see - # the resources that can be allocated on each of your Kubernetes nodes by running: - # kubectl describe nodes - # Note that requests and limits should have identical values. - resources: - requests: - cpu: "2" - memory: "512Mi" - limits: - cpu: "2" - memory: "512Mi" - ports: - - containerPort: 26257 - name: grpc - - containerPort: 8080 - name: http - readinessProbe: - httpGet: - path: "/health?ready=1" - port: http - initialDelaySeconds: 10 - periodSeconds: 5 - failureThreshold: 2 - volumeMounts: - - name: datadir - mountPath: /cockroach/cockroach-data - {{ if eq .Values.dbSSLEnabled "true" }} - - name: dell-csm-installer-database-certificates - mountPath: /cockroach/database-certificates - {{ end }} - securityContext: - privileged: true - env: - - name: COCKROACH_SKIP_KEY_PERMISSION_CHECK - value: "true" - - name: COCKROACH_CHANNEL - value: kubernetes-insecure - - name: GOMAXPROCS - valueFrom: - resourceFieldRef: - resource: limits.cpu - divisor: "1" - - name: MEMORY_LIMIT_MIB - valueFrom: - resourceFieldRef: - resource: limits.memory - divisor: "1Mi" - command: - - "/bin/bash" - - "-ecx" - # The use of qualified `hostname -f` is crucial: - # Other nodes aren't able to look up the unqualified hostname. - - exec - /cockroach/cockroach - start - --logtostderr - --advertise-host $(hostname -f) - --http-addr 0.0.0.0 - {{- if eq .Values.dbSSLEnabled "true" }} - --certs-dir /cockroach/database-certificates - {{- else }} - --insecure - {{- end }} - --join cockroachdb-0.cockroachdb,cockroachdb-1.cockroachdb,cockroachdb-2.cockroachdb - --cache $(expr $MEMORY_LIMIT_MIB / 4)MiB - --max-sql-memory $(expr $MEMORY_LIMIT_MIB / 4)MiB - # No pre-stop hook is required, a SIGTERM plus some time is all that's - # needed for graceful shutdown of a node. - terminationGracePeriodSeconds: 60 - volumes: - {{ if eq .Values.dbSSLEnabled "true" }} - - name: dell-csm-installer-database-certificates - secret: - secretName: dell-csm-installer-database-certificates - items: - - key: tls.crt - path: node.crt - mode: 0700 - - key: tls.key - path: node.key - mode: 0700 - - key: ca.crt - path: ca.crt - mode: 0700 - {{ end }} - - name: datadir - persistentVolumeClaim: - claimName: cockroachdb-claim - podManagementPolicy: Parallel - updateStrategy: - type: RollingUpdate ---- -apiVersion: v1 -kind: PersistentVolume -metadata: - name: cockroachdb-volume - labels: - type: local -spec: - storageClassName: manual - capacity: - storage: 4Gi - accessModes: - - ReadWriteOnce - hostPath: - path: {{ .Values.dbVolumeDirectory }} ---- -apiVersion: v1 -kind: PersistentVolumeClaim -metadata: - name: cockroachdb-claim -spec: - storageClassName: manual - accessModes: - - ReadWriteOnce - resources: - requests: - storage: 4Gi diff --git a/charts/csm-installer/templates/csm-installer.yaml b/charts/csm-installer/templates/csm-installer.yaml deleted file mode 100644 index 0d815d92..00000000 --- a/charts/csm-installer/templates/csm-installer.yaml +++ /dev/null @@ -1,170 +0,0 @@ -apiVersion: v1 -kind: Secret -metadata: - name: csm-creds -type: Opaque -data: - adminUserName: {{ required "Must provide the admin username for the API" .Values.adminUserName | toString | b64enc | quote }} - adminPassword: {{ required "Must provide the admin password for the API" .Values.adminPassword | toString | b64enc | quote }} - dbUserName: {{ required "Must provide the admin username for the Database" .Values.dbUserName | toString | b64enc | quote }} - dbPassword: {{ .Values.dbPassword | toString | b64enc | quote }} ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: dell-csm-installer-configmap -data: - config.yaml: | - LOG_LEVEL: "{{ .Values.logLevel }}" ---- -apiVersion: v1 -kind: ServiceAccount -metadata: - name: dell-csm-installer ---- -apiVersion: v1 -kind: Service -metadata: - name: dell-csm-installer - labels: - app: dell-csm-installer -spec: - type: NodePort - selector: - app: dell-csm-installer - ports: - - protocol: TCP - port: 8080 - targetPort: 8080 - nodePort: 31313 ---- -apiVersion: apps/v1 -kind: Deployment -metadata: - name: dell-csm-installer -spec: - replicas: {{ required "Must provide the number of csm installer instances to create." .Values.csmInstallerCount }} - selector: - matchLabels: - app: "dell-csm-installer" - template: - metadata: - labels: - app: "dell-csm-installer" - spec: - serviceAccountName: "dell-csm-installer" - affinity: - podAntiAffinity: - requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - "dell-csm-installer" - topologyKey: "kubernetes.io/hostname" - containers: - - name: "dell-csm-installer" - image: {{ required "Must provide the container image." .Values.installer.image }} - imagePullPolicy: {{ .Values.imagePullPolicy }} - env: - - name: HOST - value: {{ .Values.host | default "0.0.0.0" }} - - name: PORT - value: "{{ .Values.port | default "8080" }}" - - name: API_SERVER_IP - value: "{{ .Values.api_server_ip | default "127.0.0.1" }}" - - name: API_SERVER_PORT - value: "31313" - - name: SCHEME - value: {{ .Values.scheme | default "https" }} - - name: DB_DIR - value: "/app/db" - - name: KAPP_BINARY - value: "/app/kapp" - - name: DATA_COLLECTOR_IMAGE - value: {{ .Values.dataCollector.image }} - - name: ADMIN_USERNAME - valueFrom: - secretKeyRef: - name: csm-creds - key: adminUserName - - name: ADMIN_PASSWORD - valueFrom: - secretKeyRef: - name: csm-creds - key: adminPassword - - name: DB_USERNAME - valueFrom: - secretKeyRef: - name: csm-creds - key: dbUserName - - name: DB_PASSWORD - valueFrom: - secretKeyRef: - name: csm-creds - key: dbPassword - - name: DB_HOST - value: {{ .Values.dbHost | default "cockroachdb-public" }} - - name: DB_PORT - value: "{{ .Values.dbPort | default "26257" }}" - - name: DB_SSL_ENABLED - value: "{{ .Values.dbSSLEnabled | default "true" }}" - - name: JWT_KEY - valueFrom: - secretKeyRef: - name: dell-csm-installer-secrets - key: jwtKey - - name: CIPHER_KEY - valueFrom: - secretKeyRef: - name: dell-csm-installer-secrets - key: cipherKey - volumeMounts: - - name: cache-volume - mountPath: /app/db - - name: csm-admin-creds - mountPath: /csm/secret - readOnly: true - - name: dell-csm-installer-configmap - mountPath: "/etc/config" - {{ if eq .Values.scheme "https" }} - - name: dell-csm-installer-service-certificates - mountPath: "/app/service-certificates" - {{ end }} - {{ if eq .Values.dbSSLEnabled "true" }} - - name: dell-csm-installer-dbclient-certificates - mountPath: "/app/dbclient-certificates" - {{ end }} - volumes: - - name: cache-volume - emptyDir: { } - - name: dell-csm-installer-configmap - configMap: - name: dell-csm-installer-configmap - {{ if eq .Values.scheme "https" }} - - name: dell-csm-installer-service-certificates - secret: - secretName: dell-csm-installer-service-certificates - {{ end }} - {{ if eq .Values.dbSSLEnabled "true" }} - - name: dell-csm-installer-dbclient-certificates - secret: - secretName: dell-csm-installer-dbclient-certificates - {{ end }} - - name: csm-admin-creds - secret: - secretName: csm-creds - items: - - key: adminUserName - path: admin/ADMIN_USERNAME - mode: 0444 - - key: adminPassword - path: admin/ADMIN_PASSWORD - mode: 0444 - - key: dbUserName - path: admin/DB_USERNAME - mode: 0444 - - key: dbPassword - path: admin/DB_PASSWORD - mode: 0444 diff --git a/charts/csm-installer/templates/secrets.yaml b/charts/csm-installer/templates/secrets.yaml deleted file mode 100644 index 764cc7e7..00000000 --- a/charts/csm-installer/templates/secrets.yaml +++ /dev/null @@ -1,13 +0,0 @@ -{{ $jwtKey := required "A valid jwtKey is required" .Values.jwtKey }} -{{ $cipherKey := required "A valid cipherKey is required" .Values.cipherKey }} -{{- if not (eq (len $cipherKey) 32) }} -{{- required "cipherKey must be 32 characters in length" "" }} -{{- end }} -apiVersion: v1 -data: - jwtKey: {{ $jwtKey | b64enc }} - cipherKey: {{ $cipherKey | b64enc }} -kind: Secret -type: Opaque -metadata: - name: dell-csm-installer-secrets diff --git a/charts/csm-installer/values.yaml b/charts/csm-installer/values.yaml deleted file mode 100644 index 21261fdb..00000000 --- a/charts/csm-installer/values.yaml +++ /dev/null @@ -1,59 +0,0 @@ -csmInstallerCount: 1 - -dbInstanceCount: 2 - -imagePullPolicy: Always - -# Change this to your IP address if you want to access the server from elsewhere -host: 0.0.0.0 - -# Change to the desired port -# If you are accessing it from a different host, make sure your firewall allows it -port: 8080 - -# Allowed values are https & http (recommended is https) -scheme: "https" - -# JWT key used for signing the token -jwtKey: - -# Cipher key used for encrypt/decrypt passwords. Must be 32 characters in length. -cipherKey: - -# Set the log level (e.g. DEBUG, INFO, WARN, ERROR, FATAL) -logLevel: INFO - -# Hostname to access Cockroach DB. Should be the hostname used to expose the cocroachdb public service -dbHost: cockroachdb-public - -# Port number to access cockroach db -dbPort: 26257 - -# Enable SSL access to cockroachdb -dbSSLEnabled: "true" - -# CSM Installer image -installer: - image: dellemc/dell-csm-installer:v1.0.1 - -# CSM Data collector image -dataCollector: - image: dellemc/csm-data-collector:v1.0.1 - -# Admin username of CSM Installer -adminUserName: - -# Admin password of CSM Installer -adminPassword: - -# Username to access cocroachdb -dbUserName: root - -# Passwors to gain access to cockroachdb -dbPassword: - -# The directory on the host that will be created for the db persistent storage -dbVolumeDirectory: /var/lib/cockroachdb - -# Your kubernetes node IP address -api_server_ip: localhost From a2b00c2a650e112b63ecf08e15b8c61e9d12ffd9 Mon Sep 17 00:00:00 2001 From: nitesh3108 Date: Fri, 18 Oct 2024 09:20:12 -0400 Subject: [PATCH 6/9] linetr fix --- .../csm-replication/templates/controller.yaml | 409 +++++++++--------- 1 file changed, 206 insertions(+), 203 deletions(-) diff --git a/charts/csm-replication/templates/controller.yaml b/charts/csm-replication/templates/controller.yaml index 2410afbc..1da498ce 100644 --- a/charts/csm-replication/templates/controller.yaml +++ b/charts/csm-replication/templates/controller.yaml @@ -1,10 +1,11 @@ +--- apiVersion: v1 kind: ServiceAccount metadata: name: dell-replication-controller-sa namespace: {{ .Release.Namespace }} secrets: -- name: replication-secret + - name: replication-secret --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole @@ -12,165 +13,165 @@ metadata: creationTimestamp: null name: dell-replication-manager-role rules: -- apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions - verbs: - - get - - list - - watch -- apiGroups: - - apiextensions.k8s.io - resources: - - customresourcedefinitions/status - verbs: - - get - - list - - watch -- apiGroups: - - coordination.k8s.io - resources: - - leases - verbs: - - create - - delete - - get - - list - - update - - watch -- apiGroups: - - "" - resources: - - events - verbs: - - create - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - namespaces - verbs: - - create - - get - - list - - watch -- apiGroups: - - "" - resources: - - persistentvolumeclaims - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - persistentvolumeclaims/status - verbs: - - get - - patch - - update -- apiGroups: - - "" - resources: - - persistentvolumes - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - "" - resources: - - pods - verbs: - - get - - list - - watch -- apiGroups: - - "" - resources: - - secrets - verbs: - - get - - list - - watch -- apiGroups: - - replication.storage.dell.com - resources: - - dellcsireplicationgroups - verbs: - - create - - delete - - get - - list - - patch - - update - - watch -- apiGroups: - - replication.storage.dell.com - resources: - - dellcsireplicationgroups/status - verbs: - - get - - patch - - update -- apiGroups: - - storage.k8s.io - resources: - - storageclasses - verbs: - - get - - list - - watch -- apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotclasses"] - verbs: ["get", "list", "watch"] -- apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshotcontents"] - verbs: ["create", "get", "list", "watch", "update", "delete", "patch"] -- apiGroups: ["snapshot.storage.k8s.io"] - resources: ["volumesnapshots"] - verbs: ["get", "list", "watch", "update", "create", "delete"] + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions + verbs: + - get + - list + - watch + - apiGroups: + - apiextensions.k8s.io + resources: + - customresourcedefinitions/status + verbs: + - get + - list + - watch + - apiGroups: + - coordination.k8s.io + resources: + - leases + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - "" + resources: + - events + verbs: + - create + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - namespaces + verbs: + - create + - get + - list + - watch + - apiGroups: + - "" + resources: + - persistentvolumeclaims + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - persistentvolumeclaims/status + verbs: + - get + - patch + - update + - apiGroups: + - "" + resources: + - persistentvolumes + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - "" + resources: + - pods + verbs: + - get + - list + - watch + - apiGroups: + - "" + resources: + - secrets + verbs: + - get + - list + - watch + - apiGroups: + - replication.storage.dell.com + resources: + - dellcsireplicationgroups + verbs: + - create + - delete + - get + - list + - patch + - update + - watch + - apiGroups: + - replication.storage.dell.com + resources: + - dellcsireplicationgroups/status + verbs: + - get + - patch + - update + - apiGroups: + - storage.k8s.io + resources: + - storageclasses + verbs: + - get + - list + - watch + - apiGroups: [ "snapshot.storage.k8s.io" ] + resources: [ "volumesnapshotclasses" ] + verbs: [ "get", "list", "watch" ] + - apiGroups: [ "snapshot.storage.k8s.io" ] + resources: [ "volumesnapshotcontents" ] + verbs: [ "create", "get", "list", "watch", "update", "delete", "patch" ] + - apiGroups: [ "snapshot.storage.k8s.io" ] + resources: [ "volumesnapshots" ] + verbs: [ "get", "list", "watch", "update", "create", "delete" ] --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: dell-replication-metrics-reader rules: -- nonResourceURLs: - - /metrics - verbs: - - get + - nonResourceURLs: + - /metrics + verbs: + - get --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRole metadata: name: dell-replication-proxy-role rules: -- apiGroups: - - authentication.k8s.io - resources: - - tokenreviews - verbs: - - create -- apiGroups: - - authorization.k8s.io - resources: - - subjectaccessreviews - verbs: - - create + - apiGroups: + - authentication.k8s.io + resources: + - tokenreviews + verbs: + - create + - apiGroups: + - authorization.k8s.io + resources: + - subjectaccessreviews + verbs: + - create --- apiVersion: v1 kind: Secret @@ -191,9 +192,9 @@ roleRef: kind: ClusterRole name: dell-replication-manager-role subjects: -- kind: ServiceAccount - name: dell-replication-controller-sa - namespace: {{ .Release.Namespace }} + - kind: ServiceAccount + name: dell-replication-controller-sa + namespace: {{ .Release.Namespace }} --- apiVersion: rbac.authorization.k8s.io/v1 kind: ClusterRoleBinding @@ -204,16 +205,18 @@ roleRef: kind: ClusterRole name: dell-replication-proxy-role subjects: -- kind: ServiceAccount - name: dell-replication-controller-sa - namespace: {{ .Release.Namespace }} + - kind: ServiceAccount + name: dell-replication-controller-sa + namespace: {{ .Release.Namespace }} --- apiVersion: v1 kind: ConfigMap metadata: name: dell-replication-controller-config namespace: {{ .Release.Namespace }} -{{- $secret := (lookup "v1" "ConfigMap" "{{ .Release.Namespace }}" "dell-replication-controller-config").data -}} +{{- $configMapName := "dell-replication-controller-config" -}} +{{- $namespace := .Release.Namespace -}} +{{- $secret := (lookup "v1" "ConfigMap" $namespace $configMapName).data -}} {{ if $secret -}} data: {{- range $key, $value := $secret }} @@ -223,7 +226,7 @@ data: data: config.yaml: | clusterId: "" - targets: [] + targets: [ ] CSI_LOG_LEVEL: {{ .Values.logLevel }} {{ end }} --- @@ -236,9 +239,9 @@ metadata: namespace: {{ .Release.Namespace }} spec: ports: - - name: https - port: 8443 - targetPort: https + - name: https + port: 8443 + targetPort: https selector: control-plane: controller-manager --- @@ -265,51 +268,51 @@ spec: {{- end }} serviceAccountName: dell-replication-controller-sa containers: - - args: - - prefix=replication.storage.dell.com + - args: + - prefix=replication.storage.dell.com {{- if eq .Values.leaderElection "true" }} - - enable-leader-election + - enable-leader-election {{ end }} - - retry-interval-start {{ .Values.retryIntervalMin }} - - retry-interval-max {{ .Values.retryIntervalMax }} - command: - - /dell-replication-controller - env: - - name: X_CSI_REPLICATION_POD_NAME - valueFrom: - fieldRef: - fieldPath: metadata.name - - name: X_CSI_REPLICATION_POD_NAMESPACE - valueFrom: - fieldRef: - fieldPath: metadata.namespace - - name: X_CSI_REPLICATION_IN_CLUSTER - value: "true" - - name: X_CSI_REPLICATION_WATCH_NAMESPACE - value: {{ .Release.Namespace }} - - name: X_CSI_REPLICATION_CONFIG_DIR - value: /app/config - - name: X_CSI_REPLICATION_CERT_DIR - value: /app/certs - - name: X_CSI_REPLICATION_CONFIG_FILE_NAME - value: config - image: {{ .Values.image }} - imagePullPolicy: Always - name: manager - resources: - requests: - cpu: 100m - memory: 100Mi - volumeMounts: - - mountPath: /app/config - name: configmap-volume - - mountPath: /app/certs - name: cert-dir + - retry-interval-start {{ .Values.retryIntervalMin }} + - retry-interval-max {{ .Values.retryIntervalMax }} + command: + - /dell-replication-controller + env: + - name: X_CSI_REPLICATION_POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + - name: X_CSI_REPLICATION_POD_NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: X_CSI_REPLICATION_IN_CLUSTER + value: "true" + - name: X_CSI_REPLICATION_WATCH_NAMESPACE + value: {{ .Release.Namespace }} + - name: X_CSI_REPLICATION_CONFIG_DIR + value: /app/config + - name: X_CSI_REPLICATION_CERT_DIR + value: /app/certs + - name: X_CSI_REPLICATION_CONFIG_FILE_NAME + value: config + image: {{ .Values.image }} + imagePullPolicy: Always + name: manager + resources: + requests: + cpu: 100m + memory: 100Mi + volumeMounts: + - mountPath: /app/config + name: configmap-volume + - mountPath: /app/certs + name: cert-dir terminationGracePeriodSeconds: 10 volumes: - - emptyDir: null - name: cert-dir - - configMap: - name: dell-replication-controller-config - optional: true - name: configmap-volume + - emptyDir: { } + name: cert-dir + - configMap: + name: dell-replication-controller-config + optional: true + name: configmap-volume From 29ab49daf7ed6c6da546b18adcc18739f6123841 Mon Sep 17 00:00:00 2001 From: Surya Date: Mon, 21 Oct 2024 06:28:50 +0000 Subject: [PATCH 7/9] driver version bump --- charts/csi-isilon/Chart.yaml | 4 ++-- charts/csi-isilon/values.yaml | 4 ++-- charts/csi-powermax/Chart.yaml | 6 +++--- charts/csi-powermax/values.yaml | 6 +++--- charts/csi-powerstore/Chart.yaml | 4 ++-- charts/csi-powerstore/values.yaml | 4 ++-- installation-wizard/container-storage-modules/Chart.yaml | 6 +++--- installation-wizard/container-storage-modules/values.yaml | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) diff --git a/charts/csi-isilon/Chart.yaml b/charts/csi-isilon/Chart.yaml index 7198cef5..0c4a9339 100644 --- a/charts/csi-isilon/Chart.yaml +++ b/charts/csi-isilon/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 name: csi-isilon -version: 2.11.0 -appVersion: "2.11.0" +version: 2.12.0 +appVersion: "2.12.0" kubeVersion: ">= 1.21.0" # If you are using a complex K8s version like "v1.22.3-mirantis-1", use this kubeVersion check instead # kubeVersion: ">= 1.23.0-0" diff --git a/charts/csi-isilon/values.yaml b/charts/csi-isilon/values.yaml index 3ec8c2dc..fb4675e2 100644 --- a/charts/csi-isilon/values.yaml +++ b/charts/csi-isilon/values.yaml @@ -2,12 +2,12 @@ ######################## # version: version of this values file # Note: Do not change this value -version: "v2.11.0" +version: "v2.12.0" images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-isilon:v2.11.0 + image: quay.io/dell/container-storage-modules/csi-isilon:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 diff --git a/charts/csi-powermax/Chart.yaml b/charts/csi-powermax/Chart.yaml index cf5d81e5..9ac0cfaa 100644 --- a/charts/csi-powermax/Chart.yaml +++ b/charts/csi-powermax/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: "2.11.0" +appVersion: "2.12.0" name: csi-powermax -version: 2.11.0 +version: 2.12.0 description: | PowerMax CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as @@ -15,7 +15,7 @@ keywords: - storage dependencies: - name: csireverseproxy - version: 2.10.0 + version: 2.11.0 condition: required home: https://github.com/dell/csi-powermax icon: https://avatars1.githubusercontent.com/u/20958494?s=200&v=4 diff --git a/charts/csi-powermax/values.yaml b/charts/csi-powermax/values.yaml index 62772619..da1261bc 100644 --- a/charts/csi-powermax/values.yaml +++ b/charts/csi-powermax/values.yaml @@ -48,16 +48,16 @@ global: # Current version of the driver # Don't modify this value as this value will be used by the install script -version: "v2.11.0" +version: "v2.12.0" # "images" defines every container images used for the driver and its sidecars. # To use your own images, or a private registry, change the values here. images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-powermax:v2.11.0 + image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 csireverseproxy: - image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 diff --git a/charts/csi-powerstore/Chart.yaml b/charts/csi-powerstore/Chart.yaml index 3ed84df6..4b212ef0 100644 --- a/charts/csi-powerstore/Chart.yaml +++ b/charts/csi-powerstore/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 -appVersion: "2.11.0" +appVersion: "2.12.0" name: csi-powerstore -version: 2.11.0 +version: 2.12.0 description: | PowerStore CSI (Container Storage Interface) driver Kubernetes integration. This chart includes everything required to provision via CSI as diff --git a/charts/csi-powerstore/values.yaml b/charts/csi-powerstore/values.yaml index 1fca4463..4c07e95c 100644 --- a/charts/csi-powerstore/values.yaml +++ b/charts/csi-powerstore/values.yaml @@ -23,14 +23,14 @@ driverName: "csi-powerstore.dellemc.com" # "version" is used to verify the values file matches driver version # Not recommend to change -version: v2.11.0 +version: v2.12.0 # "images" defines every container images used for the driver and its sidecars. # To use your own images, or a private registry, change the values here. images: # "driver" defines the container image, used for the driver container. driver: - image: quay.io/dell/container-storage-modules/csi-powerstore:v2.11.1 + image: quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 diff --git a/installation-wizard/container-storage-modules/Chart.yaml b/installation-wizard/container-storage-modules/Chart.yaml index d579237d..4e69bc8a 100644 --- a/installation-wizard/container-storage-modules/Chart.yaml +++ b/installation-wizard/container-storage-modules/Chart.yaml @@ -40,17 +40,17 @@ appVersion: "1.5.0" dependencies: - name: csi-powerstore - version: 2.11.0 + version: 2.12.0 repository: https://dell.github.io/helm-charts condition: csi-powerstore.enabled - name: csi-powermax - version: 2.11.0 + version: 2.12.0 repository: https://dell.github.io/helm-charts condition: csi-powermax.enabled - name: csi-isilon - version: 2.11.0 + version: 2.12.0 repository: https://dell.github.io/helm-charts condition: csi-isilon.enabled diff --git a/installation-wizard/container-storage-modules/values.yaml b/installation-wizard/container-storage-modules/values.yaml index b30dedc6..648b5e2e 100644 --- a/installation-wizard/container-storage-modules/values.yaml +++ b/installation-wizard/container-storage-modules/values.yaml @@ -146,7 +146,7 @@ csi-powermax: driver: image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 csireverseproxy: - image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 + image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0 # CSI sidecars attacher: image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 From c6258c434084411b8d5987dc26828b68b87f1e0c Mon Sep 17 00:00:00 2001 From: Surya Date: Mon, 21 Oct 2024 06:35:30 +0000 Subject: [PATCH 8/9] reverseproxy chart bump --- charts/csi-powermax/charts/csireverseproxy/Chart.yaml | 4 ++-- charts/csi-powermax/charts/csireverseproxy/values.yaml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml index 17084e2e..2f5713d4 100644 --- a/charts/csi-powermax/charts/csireverseproxy/Chart.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/Chart.yaml @@ -4,6 +4,6 @@ description: A Helm chart for CSI PowerMax ReverseProxy type: application -version: 2.10.0 +version: 2.11.0 -appVersion: 2.10.0 +appVersion: 2.11.0 diff --git a/charts/csi-powermax/charts/csireverseproxy/values.yaml b/charts/csi-powermax/charts/csireverseproxy/values.yaml index e76fd9b6..72ee0efd 100644 --- a/charts/csi-powermax/charts/csireverseproxy/values.yaml +++ b/charts/csi-powermax/charts/csireverseproxy/values.yaml @@ -1,4 +1,4 @@ -image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.10.0 +image: quay.io/dell/container-storage-modules/csipowermax-reverseproxy:v2.11.0 port: 2222 # TLS secret which is used for setting up the proxy HTTPS server From e79fe207b695f42195181d12e40c96aade44db70 Mon Sep 17 00:00:00 2001 From: Bahubali Jain Date: Tue, 22 Oct 2024 05:36:21 -0400 Subject: [PATCH 9/9] fixed the linter issue Signed-off-by: Bahubali Jain --- charts/csm-replication/templates/controller.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/charts/csm-replication/templates/controller.yaml b/charts/csm-replication/templates/controller.yaml index 1da498ce..e6169dbf 100644 --- a/charts/csm-replication/templates/controller.yaml +++ b/charts/csm-replication/templates/controller.yaml @@ -214,9 +214,9 @@ kind: ConfigMap metadata: name: dell-replication-controller-config namespace: {{ .Release.Namespace }} -{{- $configMapName := "dell-replication-controller-config" -}} -{{- $namespace := .Release.Namespace -}} -{{- $secret := (lookup "v1" "ConfigMap" $namespace $configMapName).data -}} +{{- $configMapName := "dell-replication-controller-config" }} +{{- $namespace := .Release.Namespace }} +{{- $secret := (lookup "v1" "ConfigMap" $namespace $configMapName).data }} {{ if $secret -}} data: {{- range $key, $value := $secret }}