From e8eb1003a67f89c6c5f0b09cfe3430de72d7d580 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Mon, 17 Jun 2024 18:00:29 +0530 Subject: [PATCH 01/15] update csm-operator version --- Dockerfile | 2 +- Makefile | 2 +- README.md | 21 +++++++++++++++---- ...ll-csm-operator.clusterserviceversion.yaml | 14 ++++++------- config/install/kustomization.yaml | 2 +- config/manager/kustomization.yaml | 2 +- config/manager/manager.yaml | 4 ++-- ...ll-csm-operator.clusterserviceversion.yaml | 10 ++++----- controllers/csm_controller.go | 2 +- deploy/olm/operator_community.yaml | 2 +- deploy/operator.yaml | 4 ++-- docker.mk | 8 +++---- go.mod | 1 - go.sum | 2 -- 14 files changed, 43 insertions(+), 33 deletions(-) diff --git a/Dockerfile b/Dockerfile index 21d0d9fdd..c3ebaeffa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,7 +48,7 @@ LABEL vendor="Dell Inc." \ name="dell-csm-operator" \ summary="Operator for installing Dell CSI Drivers and Dell CSM Modules" \ description="Common Operator for installing various Dell CSI Drivers and Dell CSM Modules" \ - version="1.5.1" \ + version="1.6.0" \ license="Dell CSM Operator Apache License" # copy the licenses folder diff --git a/Makefile b/Makefile index 7bf96e99d..ee775785b 100644 --- a/Makefile +++ b/Makefile @@ -189,7 +189,7 @@ OPM = $(shell which opm) endif endif -# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v1.5.1). +# A comma-separated list of bundle images (e.g. make catalog-build BUNDLE_IMGS=example.com/operator-bundle:v0.1.0,example.com/operator-bundle:v1.6.0). # These images MUST exist in a registry and be pull-able. BUNDLE_IMGS ?= $(BUNDLE_IMG) diff --git a/README.md b/README.md index 039708bd5..899d48864 100644 --- a/README.md +++ b/README.md @@ -10,6 +10,7 @@ You may obtain a copy of the License at --> # Dell Technologies Container Storage Modules (CSM) Operator + [![Contributor Covenant](https://img.shields.io/badge/Contributor%20Covenant-v2.0%20adopted-ff69b4.svg)](https://github.com/dell/csm/blob/main/docs/CODE_OF_CONDUCT.md) [![License](https://img.shields.io/github/license/dell/csm-operator)](LICENSE) [![Docker Pulls](https://img.shields.io/docker/pulls/dellemc/dell-csm-operator)](https://hub.docker.com/r/dellemc/dell-csm-operator) @@ -27,7 +28,7 @@ Dell Technologies Container Storage Modules (CSM) Operator is an open-source Kub * [List of Adopters](./docs/ADOPTERS.md) * [Support](./docs/SUPPORT.md) * [Security](./docs/SECURITY.md) -* [Dell Container Storage Modules Operator](#dell-csm-operator) +* [Dell Container Storage Modules Operator](#dell-container-storage-modules-operator) * [Support](#support) * [Supported Platforms](#supported-platforms) * [Installation](#installation) @@ -35,6 +36,7 @@ Dell Technologies Container Storage Modules (CSM) Operator is an open-source Kub * [Uninstall CSI Drivers and CSM Modules](#uninstall-csi-drivers-and-csm-modules) # Dell Container Storage Modules Operator + Dell Container Storage Modules Operator is a Kubernetes native application which helps in installing and managing CSI Drivers and CSM Modules provided by Dell Technologies for its various storage platforms. Dell Container Storage Modules Operator uses Kubernetes CRDs (Custom Resource Definitions) to define a manifest that describes the deployment specifications for each driver to be deployed. @@ -51,10 +53,12 @@ Currently, the Dell Container Storage Modules Operator can be used to deploy the **NOTE**: You can refer to additional information about the Dell Container Storage Modules Operator on the new documentation website [here](https://dell.github.io/csm-docs/docs/deployment/csmoperator/) ## Support + The Dell Container Storage Modules Operator image is available on Dockerhub and is officially supported by Dell Technologies. For any CSM Operator and driver issues, questions or feedback, join the [Dell Technologies Container community](https://www.dell.com/community/Containers/bd-p/Containers) or the [Slack channel for Dell Container Storage Modules](https://dellemccsm.slack.com/). ## Supported Platforms + Dell Container Storage Modules Operator has been tested and qualified with * Upstream Kubernetes cluster v1.27, v1.28, v1.29 @@ -63,6 +67,7 @@ Dell Container Storage Modules Operator has been tested and qualified with ## Installation ## Install Operator (both OLM and Non OLM) in dev mode + 1. Clone the repo: `git clone https://github.com/dell/csm-operator.git` 2. Navigate one level inside the cloned repo: `cd csm-operator` 3. Execute `make install` to install the CRDs @@ -74,12 +79,15 @@ NOTE: Closing the session where operator is running will stop the operator. ## Install Operator using scripts ### Operator install on a cluster without OLM + For Non OLM based install of Operator please refer the steps given here at [https://dell.github.io/csm-docs/docs/deployment/csmoperator/#operator-installation-on-a-cluster-without-olm](https://dell.github.io/csm-docs/docs/deployment/csmoperator/#operator-installation-on-a-cluster-without-olm) To uninstall the Operator, execute `bash scripts/uninstall.sh` ### Operator install on a cluster with OLM + NOTE: Index image or Catalog image should be used for OLM based install of Operator. This mode of install is used only for internal testing purposes as the bundle and index/catalog images are not posted in Dockerhub. + 1. Clone the repo: `git clone https://github.com/dell/csm-operator.git` 2. Navigate one level inside the cloned repo: `cd csm-operator` 3. Update the image specified in `deploy/olm/operator_community.yaml` to the required image. @@ -88,31 +96,36 @@ To uninstall the Operator, execute `bash scripts/uninstall.sh` To uninstall the Operator, execute `bash scripts/uninstall_olm.sh` ### Operator install using offline bundle on a cluster without OLM -For Non OLM based install of Operator using offline bundle please refer the steps given here at [https://dell.github.io/csm-docs/docs/deployment/csmoperator/#offline-bundle-installation-on-a-cluster-without-olm](https://dell.github.io/csm-docs/docs/deployment/csmoperator/#offline-bundle-installation-on-a-cluster-without-olm) +For Non OLM based install of Operator using offline bundle please refer the steps given here at [https://dell.github.io/csm-docs/docs/deployment/csmoperator/#offline-bundle-installation-on-a-cluster-without-olm](https://dell.github.io/csm-docs/docs/deployment/csmoperator/#offline-bundle-installation-on-a-cluster-without-olm) ## Install CSI Drivers and CSM Modules + To install CSI drivers and CSM modules using the operator please refer here at [https://dell.github.io/csm-docs/docs/deployment/csmoperator/](https://dell.github.io/csm-docs/docs/deployment/csmoperator/) ## Uninstall CSI Drivers and CSM Modules + To uninstall CSI drivers and CSM modules installed using the operator please refer here at [https://dell.github.io/csm-docs/docs/deployment/csmoperator/](https://dell.github.io/csm-docs/docs/deployment/csmoperator/). ## Install Apex Connectivity Client + 1. Ensure that CSM Operator is installed and the operator pods are up and running. 2. Edit the images to point to the correct location in `connectivity_client_v100.yaml` sample file located at `csm-operator\samples` folder. 3. To deploy Apex Connectivity Client, execute `kubectl create -f samples\connectivity_client_v100.yaml`. 4. Ensure that the Apex Connectivity Client pods are up and running. ## Update Apex Connectivity Client + 1. Ensure that CSM Operator is installed and the operator pods are up and running. 2. Edit the required images to point to the correct location in `connectivity_client_v100.yaml` sample file located at `csm-operator\samples` folder. 3. To update Apex Connectivity Client, execute `kubectl apply -f samples\connectivity_client_v100.yaml`. 4. Ensure that the Apex Connectivity Client pods are up and running. ## Uninstall Apex Connectivity Client + 1. Ensure that CSM Operator is installed and the operator pods are up and running. - 3. To uninstall Apex Connectivity Client, execute `kubectl delete -f samples\connectivity_client_v100.yaml` - 4. Ensure that the Apex Connectivity Client pods are deleted. + 2. To uninstall Apex Connectivity Client, execute `kubectl delete -f samples\connectivity_client_v100.yaml` + 3. Ensure that the Apex Connectivity Client pods are deleted. ## Versioning diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index b64647267..29a51ee2c 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -1392,7 +1392,7 @@ metadata: ] capabilities: Seamless Upgrades categories: Storage - containerImage: docker.io/dellemc/dell-csm-operator:v1.5.1 + containerImage: docker.io/dellemc/dell-csm-operator:v1.6.0 createdAt: "2024-05-28T13:19:03Z" description: Easily install and manage Dell’s CSI Drivers and CSM features.operators.openshift.io/disconnected: "true" @@ -1406,7 +1406,7 @@ metadata: operators.operatorframework.io/project_layout: go.kubebuilder.io/v3 repository: https://github.com/dell/csm-operator support: Dell Technologies - name: dell-csm-operator.v1.5.1 + name: dell-csm-operator.v1.6.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -3690,7 +3690,7 @@ spec: - /manager env: - name: RELATED_IMAGE_dell-csm-operator - value: docker.io/dellemc/dell-csm-operator:v1.5.1 + value: docker.io/dellemc/dell-csm-operator:v1.6.0 - name: RELATED_IMAGE_csi-isilon value: docker.io/dellemc/csi-isilon:v2.10.1 - name: RELATED_IMAGE_csi-powermax @@ -3743,7 +3743,7 @@ spec: 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 + image: docker.io/dellemc/dell-csm-operator:v1.6.0 imagePullPolicy: Always livenessProbe: httpGet: @@ -3804,7 +3804,7 @@ spec: name: Dell Technologies url: https://github.com/dell/csm-operator relatedImages: - - image: docker.io/dellemc/dell-csm-operator:v1.5.1 + - image: docker.io/dellemc/dell-csm-operator:v1.6.0 name: dell-csm-operator - image: docker.io/dellemc/csi-isilon:v2.10.1 name: csi-isilon @@ -3859,5 +3859,5 @@ spec: - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 name: cert-persister skips: - - dell-csm-operator.v1.5.0 - version: 1.5.1 + - dell-csm-operator.v1.5.1 + version: 1.6.0 diff --git a/config/install/kustomization.yaml b/config/install/kustomization.yaml index 8557e7d41..7c3351233 100644 --- a/config/install/kustomization.yaml +++ b/config/install/kustomization.yaml @@ -14,4 +14,4 @@ bases: images: - name: controller newName: docker.io/dellemc/dell-csm-operator - newTag: v1.5.1 + newTag: v1.6.0 diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 17136c9bb..88a696666 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -13,4 +13,4 @@ kind: Kustomization images: - name: controller newName: docker.io/dellemc/dell-csm-operator - newTag: v1.5.1 + newTag: v1.6.0 diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 0337b50a2..975f95bb4 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -15,7 +15,7 @@ spec: labels: control-plane: controller-manager annotations: - storage.dell.com/CSMVersion: v1.10.0 + storage.dell.com/CSMVersion: v1.11.0 spec: serviceAccountName: manager-service-account securityContext: @@ -29,7 +29,7 @@ spec: imagePullPolicy: Always name: manager env: - - value: docker.io/dellemc/dell-csm-operator:v1.5.0 + - value: docker.io/dellemc/dell-csm-operator:v1.6.0 name: RELATED_IMAGE_dell-csm-operator - value: docker.io/dellemc/csi-isilon:v2.10.0 name: RELATED_IMAGE_csi-isilon diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index fe9c002e6..ad71502dd 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -5,7 +5,7 @@ metadata: alm-examples: '[]' capabilities: Seamless Upgrades categories: Storage - containerImage: docker.io/dellemc/dell-csm-operator:v1.5.1 + containerImage: docker.io/dellemc/dell-csm-operator:v1.6.0 createdAt: "2022-03-29T11:59:59Z" description: Easily install and manage Dell’s CSI Drivers and CSM features.operators.openshift.io/disconnected: "true" @@ -17,7 +17,7 @@ metadata: features.operators.openshift.io/token-auth-gcp: "false" repository: https://github.com/dell/csm-operator support: Dell Technologies - name: dell-csm-operator.v1.5.1 + name: dell-csm-operator.v1.6.0 namespace: placeholder spec: apiservicedefinitions: {} @@ -1239,7 +1239,7 @@ spec: name: Dell Technologies url: https://github.com/dell/csm-operator relatedImages: - - image: docker.io/dellemc/dell-csm-operator:v1.5.1 + - image: docker.io/dellemc/dell-csm-operator:v1.6.0 name: dell-csm-operator - image: docker.io/dellemc/csi-isilon:v2.10.1 name: csi-isilon @@ -1294,5 +1294,5 @@ spec: - image: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 name: cert-persister skips: - - dell-csm-operator.v1.5.0 - version: 1.5.1 + - dell-csm-operator.v1.5.1 + version: 1.6.0 diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go index 22e803e0c..d58b3270a 100644 --- a/controllers/csm_controller.go +++ b/controllers/csm_controller.go @@ -93,7 +93,7 @@ const ( CSMFinalizerName = "finalizer.dell.emc.com" // CSMVersion - - CSMVersion = "v1.10.2" + CSMVersion = "v1.11.0" ) var ( diff --git a/deploy/olm/operator_community.yaml b/deploy/olm/operator_community.yaml index e532f8c9a..8484028a5 100644 --- a/deploy/olm/operator_community.yaml +++ b/deploy/olm/operator_community.yaml @@ -5,7 +5,7 @@ metadata: namespace: test-csm-operator-olm spec: sourceType: grpc - image: docker.io/dellemc/dell-csm-operator:v1.5.1 + image: docker.io/dellemc/dell-csm-operator:v1.6.0 --- apiVersion: operators.coreos.com/v1 kind: OperatorGroup diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 7727e5ba8..4d19b168b 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1248,7 +1248,7 @@ spec: template: metadata: annotations: - storage.dell.com/CSMVersion: v1.10.2 + storage.dell.com/CSMVersion: v1.11.0 labels: control-plane: controller-manager spec: @@ -1259,7 +1259,7 @@ spec: - /manager env: - name: RELATED_IMAGE_dell-csm-operator - value: docker.io/dellemc/dell-csm-operator:v1.5.0 + value: docker.io/dellemc/dell-csm-operator:v1.6.0 - name: RELATED_IMAGE_csi-isilon value: docker.io/dellemc/csi-isilon:v2.10.0 - name: RELATED_IMAGE_csi-powermax diff --git a/docker.mk b/docker.mk index ffc4103ef..b4fdf88b7 100644 --- a/docker.mk +++ b/docker.mk @@ -14,11 +14,11 @@ BUNDLE_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-bundle # Image tag base for community catalog images CATALOG_IMAGE_TAG_BASE_COMMUNITY ?= dell-csm-community-operator-catalog -# Operator version tagged with build number. For e.g. - v1.5.1.001 -VERSION ?= v1.5.1 +# Operator version tagged with build number. For e.g. - v1.6.0.001 +VERSION ?= v1.6.0 # Bundle Version is the semantic version(required by operator-sdk) -BUNDLE_VERSION ?= 1.5.1 +BUNDLE_VERSION ?= 1.6.0 # Timestamp local builds TIMESTAMP := $(shell date +%Y%m%d%H%M%S) @@ -37,5 +37,5 @@ IMG ?= "$(REGISTRY)/$(IMAGE_TAG_BASE):$(VERSION)" # You can use it as an arg. (E.g make bundle-build BUNDLE_IMG=/:) BUNDLE_IMG ?= "$(REGISTRY)/$(BUNDLE_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)" -# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.5.1). +# The image tag given to the resulting catalog image (e.g. make catalog-build CATALOG_IMG=example.com/operator-catalog:v1.6.0). CATALOG_IMG ?= "$(REGISTRY)/$(CATALOG_IMAGE_TAG_BASE_COMMUNITY):$(VERSION)" diff --git a/go.mod b/go.mod index 4b67cd74b..81ba44fdb 100644 --- a/go.mod +++ b/go.mod @@ -51,7 +51,6 @@ require ( github.com/prometheus/common v0.42.0 // indirect github.com/prometheus/procfs v0.9.0 // indirect github.com/spf13/pflag v1.0.5 // indirect - github.com/stretchr/objx v0.5.2 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/net v0.23.0 // indirect golang.org/x/oauth2 v0.7.0 // indirect diff --git a/go.sum b/go.sum index cc80879b9..7723af960 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,6 @@ github.com/stoewer/go-strcase v1.2.0/go.mod h1:IBiWB2sKIp3wVVQ3Y035++gc+knqhUQag github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= -github.com/stretchr/objx v0.5.2 h1:xuMeJ0Sdp5ZMRXx/aWO6RZxdr3beISkG5/G/aIRr3pY= -github.com/stretchr/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= From c64c1f2c63fa4fbb6d70cf50a58f6286bee02716 Mon Sep 17 00:00:00 2001 From: chimanjain Date: Mon, 17 Jun 2024 12:33:51 -0400 Subject: [PATCH 02/15] update driver sample files and fix linting errors --- ...ll-csm-operator.clusterserviceversion.yaml | 40 +- ...ll-csm-operator.clusterserviceversion.yaml | 10 +- config/samples/storage_v1_csm_powerflex.yaml | 149 +++----- config/samples/storage_v1_csm_powermax.yaml | 151 ++++---- config/samples/storage_v1_csm_powerscale.yaml | 306 +++++++-------- config/samples/storage_v1_csm_powerstore.yaml | 23 +- config/samples/storage_v1_csm_unity.yaml | 44 +-- controllers/csm_controller_test.go | 2 +- .../powerflex/v2.11.0/controller.yaml | 260 +++++++++++++ .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../v2.11.0/driver-config-params.yaml | 13 + .../driverconfig/powerflex/v2.11.0/node.yaml | 289 ++++++++++++++ .../powerflex/v2.11.0/upgrade-path.yaml | 3 + .../powerflex/v2.8.0/upgrade-path.yaml | 2 - .../powermax/v2.11.0/controller.yaml | 323 ++++++++++++++++ .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../driver-config-params.yaml | 0 .../powermax/{v2.8.0 => v2.11.0}/node.yaml | 20 +- .../powermax/v2.11.0/upgrade-path.yaml | 3 + .../powermax/v2.8.0/upgrade-path.yaml | 1 - .../{v2.8.0 => v2.11.0}/controller.yaml | 45 ++- .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../v2.11.0/driver-config-params.yaml | 14 + .../powerscale/{v2.8.0 => v2.11.0}/node.yaml | 16 +- .../powerscale/v2.11.0/upgrade-path.yaml | 3 + .../powerscale/v2.8.0/upgrade-path.yaml | 1 - .../powerstore/v2.11.0/controller.yaml | 272 ++++++++++++++ .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../driver-config-params.yaml | 0 .../driverconfig/powerstore/v2.11.0/node.yaml | 246 ++++++++++++ .../powerstore/v2.11.0/upgrade-path.yaml | 3 + .../unity/v2.11.0/controller.yaml | 28 +- .../unity/v2.11.0/driver-config-params.yaml | 2 +- .../driverconfig/unity/v2.11.0/node.yaml | 10 +- .../unity/v2.11.0/upgrade-path.yaml | 4 +- .../unity/v2.8.0/upgrade-path.yaml | 1 - .../testdata/cr_powerflex_observability.yaml | 37 +- ...r_powerflex_observability_custom_cert.yaml | 41 +- ...observability_custom_cert_missing_key.yaml | 43 +-- .../testdata/cr_powerflex_replica.yaml | 54 ++- .../testdata/cr_powerflex_resiliency.yaml | 4 +- .../testdata/cr_powermax_observability.yaml | 170 ++++----- pkg/modules/testdata/cr_powermax_replica.yaml | 12 +- .../testdata/cr_powermax_reverseproxy.yaml | 7 +- pkg/modules/testdata/cr_powerscale_auth.yaml | 26 +- .../cr_powerscale_auth_validate_cert.yaml | 26 +- .../testdata/cr_powerscale_observability.yaml | 253 ++++++------- .../testdata/cr_powerscale_replica.yaml | 58 ++- .../testdata/cr_powerscale_resiliency.yaml | 7 +- .../testdata/cr_powerstore_resiliency.yaml | 7 +- ....yaml => storage_csm_powerflex_v2110.yaml} | 210 +++++------ ...0.yaml => storage_csm_powermax_v2110.yaml} | 185 ++++----- ...yaml => storage_csm_powerscale_v2110.yaml} | 353 ++++++++---------- ...yaml => storage_csm_powerstore_v2110.yaml} | 42 ++- samples/storage_csm_unity_v2110.yaml | 31 +- samples/storage_csm_unity_v280.yaml | 145 ------- .../badDriver/{v2.8.0 => v2.11.0}/bad.yaml | 0 .../{v2.8.0 => v2.11.0}/controller.yaml | 0 .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../driver-config-params.yaml | 0 .../{v2.8.0 => v2.11.0}/upgrade-path.yaml | 0 .../v2.8.0 => powerflex/v2.11.0}/bad.yaml | 0 .../powerflex/v2.11.0}/controller.yaml | 17 +- .../powerflex/v2.11.0/csidriver.yaml | 12 + .../v2.11.0}/driver-config-params.yaml | 0 .../driverconfig/powerflex/v2.11.0}/node.yaml | 24 +- .../powerflex/v2.11.0/upgrade-path.yaml | 1 + .../driverconfig/powermax/v2.11.0/bad.yaml | 4 + .../powermax/v2.11.0}/controller.yaml | 24 +- .../powermax/v2.11.0/csidriver.yaml | 23 ++ .../v2.11.0/driver-config-params.yaml | 21 ++ .../driverconfig/powermax/v2.11.0/node.yaml | 254 +++++++++++++ .../powermax/v2.11.0/upgrade-path.yaml | 1 + .../driverconfig/powerscale/v2.11.0/bad.yaml | 4 + .../{v2.8.0 => v2.11.0}/controller.yaml | 12 +- .../{v2.8.0 => v2.11.0}/csidriver.yaml | 0 .../v2.11.0}/driver-config-params.yaml | 0 .../powerscale/{v2.8.0 => v2.11.0}/node.yaml | 4 +- .../powerscale/v2.11.0/upgrade-path.yaml | 1 + .../v2.8.0/driver-config-params.yaml | 8 - .../powerscale/v2.8.0/upgrade-path.yaml | 1 - .../driverconfig/powerstore/v2.11.0/bad.yaml | 19 + .../powerstore/v2.11.0/config.json | 12 + .../powerstore/v2.11.0}/controller.yaml | 14 +- .../powerstore/v2.11.0/csidriver.yaml | 27 ++ .../v2.11.0/driver-config-params.yaml | 25 ++ .../powerstore/v2.11.0}/node.yaml | 6 +- .../powerstore/v2.11.0}/upgrade-path.yaml | 2 +- .../driverconfig/unity/v2.11.0/bad.yaml | 19 + .../driverconfig/unity/v2.11.0/config.json | 12 + .../unity/v2.11.0}/controller.yaml | 13 +- .../unity/v2.11.0}/csidriver.yaml | 0 .../unity/v2.11.0}/driver-config-params.yaml | 0 .../driverconfig/unity/v2.11.0}/node.yaml | 2 +- .../unity/v2.11.0/upgrade-path.yaml | 1 + .../csm_application_mobility_with_pflex.yaml | 2 +- ...m_application_mobility_with_pflex_alt.yaml | 2 +- .../powerflex_noAM.yaml | 2 +- .../e2e/testfiles/storage_csm_powerflex.yaml | 156 ++++---- .../storage_csm_powerflex_alt_vals_1.yaml | 82 ++-- .../storage_csm_powerflex_alt_vals_2.yaml | 75 ++-- .../storage_csm_powerflex_alt_vals_3.yaml | 76 ++-- .../storage_csm_powerflex_alt_vals_4.yaml | 52 +-- .../testfiles/storage_csm_powerflex_auth.yaml | 45 +-- .../storage_csm_powerflex_health_monitor.yaml | 52 +-- .../storage_csm_powerflex_observability.yaml | 16 +- ...rage_csm_powerflex_observability_auth.yaml | 47 +-- ...m_powerflex_observability_custom_cert.yaml | 16 +- ...erflex_observability_otel_custom_cert.yaml | 16 +- .../storage_csm_powerflex_replica.yaml | 124 +++--- .../storage_csm_powerflex_resiliency.yaml | 33 +- tests/e2e/testfiles/storage_csm_powermax.yaml | 9 +- .../storage_csm_powermax_observability.yaml | 12 +- .../e2e/testfiles/storage_csm_powerscale.yaml | 288 +++++++------- .../storage_csm_powerscale_alt_vals_1.yaml | 326 ++++++++-------- .../storage_csm_powerscale_alt_vals_2.yaml | 298 +++++++-------- .../storage_csm_powerscale_alt_vals_3.yaml | 316 +++++++--------- .../storage_csm_powerscale_auth.yaml | 188 ++++------ ...storage_csm_powerscale_health_monitor.yaml | 287 +++++++------- .../storage_csm_powerscale_observability.yaml | 2 +- ...age_csm_powerscale_observability_auth.yaml | 150 ++++---- ...erscale_observability_top_custom_cert.yaml | 2 +- .../storage_csm_powerscale_replica.yaml | 287 +++++++------- .../storage_csm_powerscale_resiliency.yaml | 173 ++++----- .../e2e/testfiles/storage_csm_powerstore.yaml | 9 +- .../storage_csm_powerstore_resiliency.yaml | 9 +- tests/e2e/testfiles/storage_csm_unity.yaml | 25 +- tests/shared/common.go | 16 +- 128 files changed, 4384 insertions(+), 3367 deletions(-) create mode 100644 operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml rename operatorconfig/driverconfig/powerflex/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) create mode 100644 operatorconfig/driverconfig/powerflex/v2.11.0/driver-config-params.yaml create mode 100644 operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml create mode 100644 operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml delete mode 100644 operatorconfig/driverconfig/powerflex/v2.8.0/upgrade-path.yaml create mode 100644 operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml rename operatorconfig/driverconfig/powermax/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) rename operatorconfig/driverconfig/powermax/{v2.8.0 => v2.11.0}/driver-config-params.yaml (100%) rename operatorconfig/driverconfig/powermax/{v2.8.0 => v2.11.0}/node.yaml (95%) create mode 100644 operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml delete mode 100644 operatorconfig/driverconfig/powermax/v2.8.0/upgrade-path.yaml rename operatorconfig/driverconfig/powerscale/{v2.8.0 => v2.11.0}/controller.yaml (91%) rename operatorconfig/driverconfig/powerscale/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) create mode 100644 operatorconfig/driverconfig/powerscale/v2.11.0/driver-config-params.yaml rename operatorconfig/driverconfig/powerscale/{v2.8.0 => v2.11.0}/node.yaml (95%) create mode 100644 operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml delete mode 100644 operatorconfig/driverconfig/powerscale/v2.8.0/upgrade-path.yaml create mode 100644 operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml rename operatorconfig/driverconfig/powerstore/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) rename operatorconfig/driverconfig/powerstore/{v2.8.0 => v2.11.0}/driver-config-params.yaml (100%) create mode 100644 operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml create mode 100644 operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml delete mode 100644 operatorconfig/driverconfig/unity/v2.8.0/upgrade-path.yaml rename samples/{storage_csm_powerflex_v280.yaml => storage_csm_powerflex_v2110.yaml} (73%) rename samples/{storage_csm_powermax_v280.yaml => storage_csm_powermax_v2110.yaml} (77%) rename samples/{storage_csm_powerscale_v280.yaml => storage_csm_powerscale_v2110.yaml} (65%) rename samples/{storage_csm_powerstore_v280.yaml => storage_csm_powerstore_v2110.yaml} (88%) delete mode 100644 samples/storage_csm_unity_v280.yaml rename tests/config/driverconfig/badDriver/{v2.8.0 => v2.11.0}/bad.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.8.0 => v2.11.0}/controller.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.8.0 => v2.11.0}/driver-config-params.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.8.0 => v2.11.0}/upgrade-path.yaml (100%) rename tests/config/driverconfig/{powerscale/v2.8.0 => powerflex/v2.11.0}/bad.yaml (100%) rename {operatorconfig/driverconfig/powerflex/v2.8.0 => tests/config/driverconfig/powerflex/v2.11.0}/controller.yaml (94%) create mode 100644 tests/config/driverconfig/powerflex/v2.11.0/csidriver.yaml rename {operatorconfig/driverconfig/powerflex/v2.8.0 => tests/config/driverconfig/powerflex/v2.11.0}/driver-config-params.yaml (100%) rename {operatorconfig/driverconfig/powerflex/v2.8.0 => tests/config/driverconfig/powerflex/v2.11.0}/node.yaml (95%) create mode 100644 tests/config/driverconfig/powerflex/v2.11.0/upgrade-path.yaml create mode 100644 tests/config/driverconfig/powermax/v2.11.0/bad.yaml rename {operatorconfig/driverconfig/powermax/v2.8.0 => tests/config/driverconfig/powermax/v2.11.0}/controller.yaml (94%) create mode 100644 tests/config/driverconfig/powermax/v2.11.0/csidriver.yaml create mode 100644 tests/config/driverconfig/powermax/v2.11.0/driver-config-params.yaml create mode 100644 tests/config/driverconfig/powermax/v2.11.0/node.yaml create mode 100644 tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml create mode 100644 tests/config/driverconfig/powerscale/v2.11.0/bad.yaml rename tests/config/driverconfig/powerscale/{v2.8.0 => v2.11.0}/controller.yaml (96%) rename tests/config/driverconfig/powerscale/{v2.8.0 => v2.11.0}/csidriver.yaml (100%) rename {operatorconfig/driverconfig/powerscale/v2.8.0 => tests/config/driverconfig/powerscale/v2.11.0}/driver-config-params.yaml (100%) rename tests/config/driverconfig/powerscale/{v2.8.0 => v2.11.0}/node.yaml (99%) create mode 100644 tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml delete mode 100644 tests/config/driverconfig/powerscale/v2.8.0/driver-config-params.yaml delete mode 100644 tests/config/driverconfig/powerscale/v2.8.0/upgrade-path.yaml create mode 100644 tests/config/driverconfig/powerstore/v2.11.0/bad.yaml create mode 100644 tests/config/driverconfig/powerstore/v2.11.0/config.json rename {operatorconfig/driverconfig/powerstore/v2.8.0 => tests/config/driverconfig/powerstore/v2.11.0}/controller.yaml (96%) create mode 100644 tests/config/driverconfig/powerstore/v2.11.0/csidriver.yaml create mode 100644 tests/config/driverconfig/powerstore/v2.11.0/driver-config-params.yaml rename {operatorconfig/driverconfig/powerstore/v2.8.0 => tests/config/driverconfig/powerstore/v2.11.0}/node.yaml (98%) rename {operatorconfig/driverconfig/powerstore/v2.8.0 => tests/config/driverconfig/powerstore/v2.11.0}/upgrade-path.yaml (96%) create mode 100644 tests/config/driverconfig/unity/v2.11.0/bad.yaml create mode 100644 tests/config/driverconfig/unity/v2.11.0/config.json rename {operatorconfig/driverconfig/unity/v2.8.0 => tests/config/driverconfig/unity/v2.11.0}/controller.yaml (95%) rename {operatorconfig/driverconfig/unity/v2.8.0 => tests/config/driverconfig/unity/v2.11.0}/csidriver.yaml (100%) rename {operatorconfig/driverconfig/unity/v2.8.0 => tests/config/driverconfig/unity/v2.11.0}/driver-config-params.yaml (100%) rename {operatorconfig/driverconfig/unity/v2.8.0 => tests/config/driverconfig/unity/v2.11.0}/node.yaml (99%) create mode 100644 tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 29a51ee2c..f42e15cb5 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -101,10 +101,10 @@ metadata: "value": "debug" } ], - "image": "dellemc/csi-isilon:v2.10.1", + "image": "dellemc/csi-isilon:v2.11.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.10.1", + "configVersion": "v2.11.0", "controller": { "envs": [ { @@ -470,10 +470,10 @@ metadata: "value": "" } ], - "image": "dellemc/csi-powermax:v2.10.1", + "image": "dellemc/csi-powermax:v2.11.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.10.1", + "configVersion": "v2.11.0", "controller": { "envs": [ { @@ -776,10 +776,10 @@ metadata: "value": "debug" } ], - "image": "dellemc/csi-powerstore:v2.10.1", + "image": "dellemc/csi-powerstore:v2.11.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.10.1", + "configVersion": "v2.11.0", "controller": { "envs": [ { @@ -961,10 +961,10 @@ metadata: "value": "true" } ], - "image": "dellemc/csi-unity:v2.10.1", + "image": "dellemc/csi-unity:v2.11.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.10.1", + "configVersion": "v2.11.0", "controller": { "envs": [ { @@ -1070,10 +1070,10 @@ metadata: "value": "false" } ], - "image": "dellemc/csi-vxflexos:v2.10.1", + "image": "dellemc/csi-vxflexos:v2.11.0", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.10.1", + "configVersion": "v2.11.0", "controller": { "envs": [ { @@ -3692,17 +3692,17 @@ spec: - name: RELATED_IMAGE_dell-csm-operator value: docker.io/dellemc/dell-csm-operator:v1.6.0 - name: RELATED_IMAGE_csi-isilon - value: docker.io/dellemc/csi-isilon:v2.10.1 + value: docker.io/dellemc/csi-isilon:v2.11.0 - name: RELATED_IMAGE_csi-powermax - value: docker.io/dellemc/csi-powermax:v2.10.1 + value: docker.io/dellemc/csi-powermax:v2.11.0 - 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 + value: docker.io/dellemc/csi-powerstore:v2.11.0 - name: RELATED_IMAGE_csi-unity - value: docker.io/dellemc/csi-unity:v2.10.1 + value: docker.io/dellemc/csi-unity:v2.11.0 - name: RELATED_IMAGE_csi-vxflexos - value: docker.io/dellemc/csi-vxflexos:v2.10.1 + value: docker.io/dellemc/csi-vxflexos:v2.11.0 - name: RELATED_IMAGE_sdc value: docker.io/dellemc/sdc:4.5.1 - name: RELATED_IMAGE_karavi-authorization-proxy @@ -3806,17 +3806,17 @@ spec: relatedImages: - image: docker.io/dellemc/dell-csm-operator:v1.6.0 name: dell-csm-operator - - image: docker.io/dellemc/csi-isilon:v2.10.1 + - image: docker.io/dellemc/csi-isilon:v2.11.0 name: csi-isilon - - image: docker.io/dellemc/csi-powermax:v2.10.1 + - image: docker.io/dellemc/csi-powermax:v2.11.0 name: csi-powermax - image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 name: csipowermax-reverseproxy - - image: docker.io/dellemc/csi-powerstore:v2.10.1 + - image: docker.io/dellemc/csi-powerstore:v2.11.0 name: csi-powerstore - - image: docker.io/dellemc/csi-unity:v2.10.1 + - image: docker.io/dellemc/csi-unity:v2.11.0 name: csi-unity - - image: docker.io/dellemc/csi-vxflexos:v2.10.1 + - image: docker.io/dellemc/csi-vxflexos:v2.11.0 name: csi-vxflexos - image: docker.io/dellemc/sdc:4.5.1 name: sdc diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index ad71502dd..8dbd16927 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -1241,17 +1241,17 @@ spec: relatedImages: - image: docker.io/dellemc/dell-csm-operator:v1.6.0 name: dell-csm-operator - - image: docker.io/dellemc/csi-isilon:v2.10.1 + - image: docker.io/dellemc/csi-isilon:v2.11.0 name: csi-isilon - - image: docker.io/dellemc/csi-powermax:v2.10.1 + - image: docker.io/dellemc/csi-powermax:v2.11.0 name: csi-powermax - image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 name: csipowermax-reverseproxy - - image: docker.io/dellemc/csi-powerstore:v2.10.1 + - image: docker.io/dellemc/csi-powerstore:v2.11.0 name: csi-powerstore - - image: docker.io/dellemc/csi-unity:v2.10.1 + - image: docker.io/dellemc/csi-unity:v2.11.0 name: csi-unity - - image: docker.io/dellemc/csi-vxflexos:v2.10.1 + - image: docker.io/dellemc/csi-vxflexos:v2.11.0 name: csi-vxflexos - image: docker.io/dellemc/sdc:4.5.1 name: sdc diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 7cd23903e..804a54928 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -16,13 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.10.1" + image: "dellemc/csi-vxflexos:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -40,9 +40,8 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - sideCars: - # 'k8s' represents a string prepended to each volume created by the CSI driver + # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 args: ["--volume-name-prefix=k8s"] @@ -56,19 +55,17 @@ spec: image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever image: dellemc/csi-metadata-retriever:v1.7.3 - - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -89,13 +86,11 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_POWERFLEX_EXTERNAL_ACCESS: Allows to specify additional entries for hostAccess of NFS volumes. Both single IP address and subnet are valid entries. # Allowed Values: x.x.x.x/xx or x.x.x.x # Default Value: None - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS value: - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -118,10 +113,8 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_APPROVE_SDC_ENABLED: Enables/Disable SDC approval # Allowed values: # true: enable SDC approval @@ -129,7 +122,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage # Allowed values: # true: enable checking of health condition of CSI volumes @@ -137,7 +129,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -145,14 +136,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # If value is zero Container Orchestrator shall decide how many volumes of this type can be published by the controller to the node. @@ -160,9 +149,6 @@ spec: # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - - - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -185,15 +171,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value - + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -201,17 +185,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -238,7 +220,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -259,7 +240,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - # enabled: Enable/Disable cert-manager # Allowed values: # true: enable deployment of cert-manager @@ -267,7 +247,6 @@ spec: # Default value: false - name: cert-manager enabled: false - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false @@ -324,7 +303,6 @@ spec: # Default value: "otel-collector:55680" - name: "COLLECTOR_ADDRESS" value: "otel-collector:55680" - # Replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -336,53 +314,50 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters - # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerflex" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerflex" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" - name: resiliency # enabled: Enable/Disable Resiliency feature # Allowed values: diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index e42741748..46f99f372 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/config/samples/storage_v1_csm_powermax.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerMax v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -44,8 +43,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerMax driver v2.10.1 - image: dellemc/csi-powermax:v2.10.1 + image: dellemc/csi-powermax:v2.11.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -230,15 +228,13 @@ spec: # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false - args: [ "--monitor-interval=60s" ] + 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" # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m #- name: provisioner # args: ["--capacity-poll-interval=5m"] - modules: # CSI Powermax Reverseproxy is a mandatory module for Powermax - name: csireverseproxy @@ -247,39 +243,37 @@ spec: forceRemoveModule: true configVersion: v2.9.1 components: - - name: csipowermax-reverseproxy - # image: Define the container images used for the reverse proxy - # Default value: None - # 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 + - name: csipowermax-reverseproxy + # image: Define the container images used for the reverse proxy # Default value: None - # Example: "tls-secret" - - name: X_CSI_REVPROXY_TLS_SECRET - value: "csirevproxy-tls-secret" - - name: X_CSI_REVPROXY_PORT - value: "2222" - - name: X_CSI_CONFIG_MAP_NAME - value: "powermax-reverseproxy-config" - + # 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 + # Default value: None + # Example: "tls-secret" + - name: X_CSI_REVPROXY_TLS_SECRET + value: "csirevproxy-tls-secret" + - name: X_CSI_REVPROXY_PORT + value: "2222" + - name: X_CSI_CONFIG_MAP_NAME + value: "powermax-reverseproxy-config" # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # Replication: allows configuring replication module # Replication CRDs must be installed before installing driver - name: replication @@ -291,53 +285,51 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature - # Allowed values: string - # Default value: powermax - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powermax" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powermax + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powermax" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -364,7 +356,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -385,7 +376,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -393,7 +383,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: false enabled: false - - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics enabled: false diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index 8747d8205..494df1280 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/config/samples/storage_v1_csm_powerscale.yaml @@ -16,16 +16,14 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerScale v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet # Uninstall CSI Driver and/or modules when CR is deleted forceRemoveDriver: true common: - # Image for CSI PowerScale driver v2.10.1 - image: "dellemc/csi-isilon:v2.10.1" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs @@ -36,14 +34,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -52,7 +48,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -60,7 +55,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -68,7 +62,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -78,7 +71,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_ISI_AUTH_TYPE: Specify the authentication method to be used. # Allowed values: # 0: basic authentication @@ -86,7 +78,6 @@ spec: # Default value: 0 - name: X_CSI_ISI_AUTH_TYPE value: "0" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -96,77 +87,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -184,42 +165,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -246,7 +222,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 @@ -266,12 +241,11 @@ spec: enabled: false 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 when the storageCapacity is set as "true" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -279,17 +253,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -301,54 +273,51 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature - # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -375,7 +344,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -396,15 +364,13 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager - # enabled: Enable/Disable cert-manager - # Allowed values: - # true: enable deployment of cert-manager - # false: disable deployment of cert-manager only if it's already deployed - # Default value: false + # enabled: Enable/Disable cert-manager + # Allowed values: + # true: enable deployment of cert-manager + # false: disable deployment of cert-manager only if it's already deployed + # Default value: false enabled: false - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/config/samples/storage_v1_csm_powerstore.yaml b/config/samples/storage_v1_csm_powerstore.yaml index fb8eb9ea8..92a188cc9 100644 --- a/config/samples/storage_v1_csm_powerstore.yaml +++ b/config/samples/storage_v1_csm_powerstore.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerStore v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # authSecret: This is the secret used to validate the default PowerStore secret used for installation # Allowed values: -config # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config @@ -43,8 +42,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerStore driver v2.10.1 - image: "dellemc/csi-powerstore:v2.10.1" + image: "dellemc/csi-powerstore:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX @@ -58,7 +56,6 @@ spec: value: /var/lib/kubelet - name: CSI_LOG_LEVEL value: debug - sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner @@ -74,17 +71,16 @@ spec: 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: false 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" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] controller: envs: @@ -117,8 +113,7 @@ spec: # Allowed Values: x.x.x.x/xx or x.x.x.x # Default Value: - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS - value: - + value: # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -155,7 +150,6 @@ spec: # Default value: "0" - name: X_CSI_POWERSTORE_MAX_VOLUMES_PER_NODE value: "0" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -174,7 +168,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature diff --git a/config/samples/storage_v1_csm_unity.yaml b/config/samples/storage_v1_csm_unity.yaml index f73d8bac3..03f76ba93 100644 --- a/config/samples/storage_v1_csm_unity.yaml +++ b/config/samples/storage_v1_csm_unity.yaml @@ -16,22 +16,20 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI Unity v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - # Image for CSI Unity driver v2.10.1 - image: "dellemc/csi-unity:v2.10.1" + image: "dellemc/csi-unity:v2.11.0" imagePullPolicy: IfNotPresent envs: - # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. - # Allowed values: boolean - # Default value: "false" - # Examples : "true" , "false" + # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. + # Allowed values: boolean + # Default value: "false" + # Examples : "true" , "false" - name: X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS value: "false" - name: X_CSI_EPHEMERAL_STAGING_PATH @@ -57,6 +55,11 @@ spec: # Default value: "info" - name: CSI_LOG_LEVEL value: debug + # CSI driver log format + # Allowed values: "TEXT" or "JSON" + # Default value: "TEXT" + - name: CSI_LOG_FORMAT + value: "TEXT" # TENANT_NAME - Tenant name that need to added while adding host entry to the array. # Allowed values: string # Default value: "" @@ -78,7 +81,6 @@ spec: # Default value: true - name: X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION value: "true" - sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner @@ -93,15 +95,15 @@ 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.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 - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - + image: dellemc/csi-metadata-retriever:v1.7.2 # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] + enabled: false args: ["--monitor-interval=60s"] image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 @@ -136,7 +138,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_ALLOWED_NETWORKS: Custom networks for Unity export # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. # Allowed values: list of one or more networks @@ -146,7 +147,6 @@ spec: # eg: "192.168.1.0/24 192.168.100.0/22" - name: X_CSI_ALLOWED_NETWORKS value: "" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -161,7 +161,7 @@ spec: # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" +# Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint +# - key: "node-role.kubernetes.io/control-plane" +# operator: "Exists" +# effect: "NoSchedule" diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index afe7b25fa..70f6525a9 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -1003,7 +1003,7 @@ func (suite *CSMControllerTestSuite) TestContentWatch() { expRateLimiter := workqueue.NewItemExponentialFailureRateLimiter(5*time.Millisecond, 120*time.Second) suite.createReconciler().SetupWithManager(nil, expRateLimiter, 1) close(StopWatch) - version, err := utils.GetModuleDefaultVersion("v2.10.1", "csi-isilon", csmv1.Authorization, "../operatorconfig") + version, err := utils.GetModuleDefaultVersion("v2.11.0", "csi-isilon", csmv1.Authorization, "../operatorconfig") assert.NotNil(suite.T(), err) assert.NotNil(suite.T(), version) } diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml new file mode 100644 index 000000000..0443ace2e --- /dev/null +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml @@ -0,0 +1,260 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -controller + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +rules: + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "watch", "list", "delete", "update", "create"] + - apiGroups: [""] + resources: ["events"] + verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch", "patch"] + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete", "update", "patch"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: [""] + resources: ["persistentvolumeclaims/status"] + verbs: ["update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update", "patch", "delete"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] + - apiGroups: ["csi.storage.k8s.io"] + resources: ["csinodeinfos"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "watch", "update", "delete"] + # below for snapshotter + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list"] + - 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: ["snapshot.storage.k8s.io"] + resources: ["volumesnapshots/status", "volumesnapshotcontents/status"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["apiextensions.k8s.io"] + resources: ["customresourcedefinitions"] + verbs: ["create", "list", "watch", "delete", "update"] + # Permissions for CSIStorageCapacity + - apiGroups: ["storage.k8s.io"] + resources: ["csistoragecapacities"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +subjects: + - kind: ServiceAccount + name: -controller + namespace: +roleRef: + kind: ClusterRole + name: -controller + apiGroup: rbac.authorization.k8s.io +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: -controller + namespace: + annotations: + com.dell.karavi-authorization-proxy: "true" +spec: + strategy: + rollingUpdate: + maxUnavailable: 1 + selector: + matchLabels: + name: -controller + replicas: 2 + template: + metadata: + labels: + name: -controller + annotations: + kubectl.kubernetes.io/default-container: driver + spec: + affinity: + nodeSelector: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - -controller + topologyKey: kubernetes.io/hostname + serviceAccountName: -controller + containers: + - name: attacher + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election=true" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--feature-gates=Topology=true" + - "--volume-name-prefix=k8s" + - "--volume-name-uuid-length=10" + - "--leader-election=true" + - "--timeout=120s" + - "--v=5" + - "--default-fstype=ext4" + - "--extra-create-metadata" + - "--enable-capacity=true" + - "--capacity-ownerref-level=2" + - "--capacity-poll-interval=5m" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: csi-external-health-monitor-controller + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election=true" + - "--enable-node-watcher=true" + - "--http-endpoint=:8080" + - "--monitor-interval=60s" + - "--timeout=180s" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: snapshotter + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--timeout=120s" + - "--v=5" + - "--leader-election=true" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: resizer + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election=true" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: driver + image: dellemc/csi-vxflexos:v2.11.0 + imagePullPolicy: IfNotPresent + command: ["/csi-vxflexos.sh"] + args: + - "--array-config=/vxflexos-config/config" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + env: + - name: CSI_ENDPOINT + value: /var/run/csi/csi.sock + - name: X_CSI_MODE + value: controller + - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE + value: false + - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT + value: false + - name: SSL_CERT_DIR + value: /certs + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + - name: X_CSI_QUOTA_ENABLED + value: + - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS + value: + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: vxflexos-config + mountPath: /vxflexos-config + - name: vxflexos-config-params + mountPath: /vxflexos-config-params + - name: certs + mountPath: /certs + readOnly: true + volumes: + - name: socket-dir + emptyDir: + - name: vxflexos-config + secret: + secretName: -config + - name: vxflexos-config-params + configMap: + name: -config-params + - name: certs + projected: + sources: + - secret: + name: -certs-0 + items: + - key: cert-0 + path: cert-0 diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/csidriver.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/powerflex/v2.8.0/csidriver.yaml rename to operatorconfig/driverconfig/powerflex/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/driver-config-params.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/driver-config-params.yaml new file mode 100644 index 000000000..7debd9c08 --- /dev/null +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/driver-config-params.yaml @@ -0,0 +1,13 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: -config-params + namespace: +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" + PODMON_CONTROLLER_LOG_LEVEL: "debug" + PODMON_CONTROLLER_LOG_FORMAT: "TEXT" + PODMON_NODE_LOG_LEVEL: "debug" + PODMON_NODE_LOG_FORMAT: "TEXT" \ No newline at end of file diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml new file mode 100644 index 000000000..0e7b792a9 --- /dev/null +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml @@ -0,0 +1,289 @@ +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -node + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["create", "delete", "get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["security.openshift.io"] + resourceNames: ["privileged"] + resources: ["securitycontextconstraints"] + verbs: ["use"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "watch", "update", "delete"] + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "watch", "list", "delete", "update", "create"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +subjects: + - kind: ServiceAccount + name: -node + namespace: +roleRef: + kind: ClusterRole + name: -node + apiGroup: rbac.authorization.k8s.io +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: -node + namespace: + annotations: + com.dell.karavi-authorization-proxy: "true" +spec: + selector: + matchLabels: + app: -node + template: + metadata: + labels: + app: -node + driver.dellemc.com: dell-storage + annotations: + kubectl.kubernetes.io/default-container: driver + spec: + serviceAccount: -node + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostPID: false + containers: + - name: driver + securityContext: + privileged: true + allowPrivilegeEscalation: true + capabilities: + add: ["SYS_ADMIN"] + image: dellemc/csi-vxflexos:v2.11.0 + imagePullPolicy: IfNotPresent + command: ["/csi-vxflexos.sh"] + args: + - "--array-config=/vxflexos-config/config" + - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + env: + - name: CSI_ENDPOINT + value: unix:///plugins/vxflexos.emc.dell.com/csi_sock + - name: X_CSI_MODE + value: node + - name: X_CSI_PRIVATE_MOUNT_DIR + value: "/plugins/vxflexos.emc.dell.com/disks" + - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS + value: false + - name: SSL_CERT_DIR + value: /certs + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + - name: X_CSI_APPROVE_SDC_ENABLED + value: + - name: X_CSI_RENAME_SDC_ENABLED + value: + - name: X_CSI_RENAME_SDC_PREFIX + value: + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: + - name: X_CSI_POWERFLEX_KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + volumeMounts: + - name: driver-path + mountPath: /plugins/vxflexos.emc.dell.com + - name: volumedevices-path + mountPath: /plugins/kubernetes.io/csi/volumeDevices + mountPropagation: "Bidirectional" + - name: pods-path + mountPath: /pods + mountPropagation: "Bidirectional" + - name: noderoot + mountPath: /noderoot + - name: dev + mountPath: /dev + - name: vxflexos-config + mountPath: /vxflexos-config + - name: vxflexos-config-params + mountPath: /vxflexos-config-params + - name: certs + mountPath: /certs + readOnly: true + - name: registrar + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + imagePullPolicy: IfNotPresent + args: + - "--v=5" + - "--csi-address=$(ADDRESS)" + - --kubelet-registration-path=/plugins/vxflexos.emc.dell.com/csi_sock + env: + - name: ADDRESS + value: /csi/csi_sock + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + volumeMounts: + - name: registration-dir + mountPath: /registration + - name: driver-path + mountPath: /csi + - name: sdc-monitor + securityContext: + privileged: true + image: dellemc/sdc:4.5.1 + imagePullPolicy: IfNotPresent + env: + - name: HOST_PID + value: "1" + - name: HOST_NET + value: "1" + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: MODE + value: "monitoring" + volumeMounts: + - name: dev + mountPath: /dev + - name: os-release + mountPath: /host-os-release + - name: sdc-storage + mountPath: /storage + - name: udev-d + mountPath: /rules.d + - name: host-opt-emc-path + mountPath: /host_opt_emc_path + initContainers: + - name: sdc + securityContext: + privileged: true + image: dellemc/sdc:4.5.1 + imagePullPolicy: IfNotPresent + env: + - name: NODENAME + valueFrom: + fieldRef: + fieldPath: spec.nodeName + - name: MODE + value: "config" + - name: MDM + valueFrom: + secretKeyRef: + name: -config + key: MDM + - name: HOST_DRV_CFG_PATH + value: /opt/emc/scaleio/sdc/bin + volumeMounts: + - name: dev + mountPath: /dev + - name: os-release + mountPath: /host-os-release + - name: sdc-storage + mountPath: /storage + - name: udev-d + mountPath: /rules.d + - name: scaleio-path-opt + mountPath: /host_drv_cfg_path + - name: host-opt-emc-path + mountPath: /host_opt_emc_path + volumes: + - name: registration-dir + hostPath: + path: /plugins_registry/ + type: DirectoryOrCreate + - name: driver-path + hostPath: + path: /plugins/vxflexos.emc.dell.com + type: DirectoryOrCreate + - name: volumedevices-path + hostPath: + path: /plugins/kubernetes.io/csi/volumeDevices + type: DirectoryOrCreate + - name: pods-path + hostPath: + path: /pods + type: Directory + - name: noderoot + hostPath: + path: / + type: Directory + - name: dev + hostPath: + path: /dev + type: Directory + - name: scaleio-path-opt + hostPath: + path: /opt/emc/scaleio/sdc/bin + type: DirectoryOrCreate + - name: sdc-storage + hostPath: + path: /var/emc-scaleio + type: DirectoryOrCreate + - name: udev-d + hostPath: + path: /etc/udev/rules.d + type: Directory + - name: os-release + hostPath: + path: /etc/os-release + type: File + - name: host-opt-emc-path + hostPath: + path: /opt/emc + type: Directory + - name: vxflexos-config + secret: + secretName: -config + - name: vxflexos-config-params + configMap: + name: -config-params + - name: usr-bin + hostPath: + path: /usr/bin + type: Directory + - name: kubelet-pods + hostPath: + path: /var/lib/kubelet/pods + type: Directory + - name: var-run + hostPath: + path: /var/run + type: Directory + - name: certs + projected: + sources: + - secret: + name: -certs-0 + items: + - key: cert-0 + path: cert-0 diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..b1ece56b6 --- /dev/null +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml @@ -0,0 +1,3 @@ + + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerflex/v2.8.0/upgrade-path.yaml deleted file mode 100644 index 624d827ab..000000000 --- a/operatorconfig/driverconfig/powerflex/v2.8.0/upgrade-path.yaml +++ /dev/null @@ -1,2 +0,0 @@ - -minUpgradePath: v2.6.0 diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml new file mode 100644 index 000000000..075d6bd70 --- /dev/null +++ b/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml @@ -0,0 +1,323 @@ +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -controller + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +rules: + - apiGroups: [""] + resources: ["events"] + verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete", "update"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] + - apiGroups: ["csi.storage.k8s.io"] + resources: ["csinodeinfos"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch", "update"] + # below for snapshotter + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list"] + - 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", "volumesnapshots/status"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["snapshot.storage.k8s.io"] + resources: ["volumesnapshotcontents/status"] + verbs: ["update", "patch"] + - apiGroups: ["apiextensions.k8s.io"] + resources: ["customresourcedefinitions"] + verbs: ["create", "list", "watch", "delete"] + # below for resizer + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["update", "patch"] + - apiGroups: [""] + resources: ["persistentvolumeclaims/status"] + verbs: ["update", "patch"] + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "watch", "list", "delete", "update", "create"] + # Permissions for CSIStorageCapacity + - apiGroups: ["storage.k8s.io"] + resources: ["csistoragecapacities"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +subjects: + - kind: ServiceAccount + name: -controller + namespace: +roleRef: + kind: ClusterRole + name: -controller + apiGroup: rbac.authorization.k8s.io +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: -controller + namespace: +spec: + selector: + matchLabels: + app: -controller + replicas: 2 + strategy: + type: RollingUpdate + rollingUpdate: + maxUnavailable: 1 + template: + metadata: + labels: + app: -controller + annotations: + kubectl.kubernetes.io/default-container: driver + spec: + serviceAccount: -controller + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - -controller + topologyKey: kubernetes.io/hostname + containers: + - name: resizer + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--leader-election" + - "--timeout=180s" + - "--v=5" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: attacher + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election" + - "--timeout=180s" + - "--worker-threads=6" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: external-health-monitor + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election" + - "--enable-node-watcher=true" + - "--monitor-interval=60s" + - "--timeout=180s" + - "--http-endpoint=:8080" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--volume-name-prefix=pmax" + - "--volume-name-uuid-length=10" + - "--worker-threads=6" + - "--timeout=120s" + - "--v=5" + - "--feature-gates=Topology=true" + - "--leader-election" + - "--extra-create-metadata" + - "--default-fstype=ext4" + - "--enable-capacity=true" + - "--capacity-ownerref-level=2" + - "--capacity-poll-interval=5m" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: snapshotter + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--timeout=180s" + - "--v=5" + - "--snapshot-name-prefix=pmsn" + - "--leader-election" + - "--snapshot-name-uuid-length=10" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: driver + image: dellemc/csi-powermax:v2.11.0 + imagePullPolicy: IfNotPresent + command: ["/csi-powermax.sh"] + env: + - name: X_CSI_POWERMAX_DRIVER_NAME + value: csi-powermax.dellemc.com + - name: CSI_ENDPOINT + value: /var/run/csi/csi.sock + - name: X_CSI_MANAGED_ARRAYS + value: "" + - name: X_CSI_POWERMAX_ENDPOINT + value: "" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "" + - name: X_CSI_MODE + value: controller + - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION + value: "true" + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + key: username + name: powermax-creds + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + key: password + name: powermax-creds + - name: X_CSI_POWERMAX_DEBUG + value: "" + - name: X_CSI_POWERMAX_PORTGROUPS + value: "" + - name: X_CSI_GRPC_MAX_THREADS + value: "50" + - name: X_CSI_ENABLE_BLOCK + value: "true" + - name: X_CSI_TRANSPORT_PROTOCOL + value: "" + - name: SSL_CERT_DIR + value: /certs + - name: X_CSI_IG_NODENAME_TEMPLATE + value: "" + - name: X_CSI_IG_MODIFY_HOSTNAME + value: "" + - name: X_CSI_POWERMAX_PROXY_SERVICE_NAME + value: "csipowermax-reverseproxy" + - name: X_CSI_UNISPHERE_TIMEOUT + value: 5m + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config-params/driver-config-params.yaml + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + - name: X_CSI_VSPHERE_ENABLED + value: "" + - name: X_CSI_VSPHERE_PORTGROUP + value: "" + - name: X_CSI_VSPHERE_HOSTNAME + value: "" + - name: X_CSI_VCENTER_HOST + value: "" + - name: X_CSI_VCENTER_USERNAME + valueFrom: + secretKeyRef: + key: username + name: vcenter-creds + optional: true + - name: X_CSI_VCENTER_PWD + valueFrom: + secretKeyRef: + key: password + name: vcenter-creds + optional: true + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: certs + mountPath: /certs + readOnly: true + - name: powermax-config-params + mountPath: -config-params + volumes: + - name: socket-dir + emptyDir: + - name: certs + secret: + secretName: -certs + optional: true + - name: powermax-config-params + configMap: + name: -config-params diff --git a/operatorconfig/driverconfig/powermax/v2.8.0/csidriver.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/powermax/v2.8.0/csidriver.yaml rename to operatorconfig/driverconfig/powermax/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/powermax/v2.8.0/driver-config-params.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/powermax/v2.8.0/driver-config-params.yaml rename to operatorconfig/driverconfig/powermax/v2.11.0/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/powermax/v2.8.0/node.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml similarity index 95% rename from operatorconfig/driverconfig/powermax/v2.8.0/node.yaml rename to operatorconfig/driverconfig/powermax/v2.11.0/node.yaml index 8a12ca606..48dcc2add 100644 --- a/operatorconfig/driverconfig/powermax/v2.8.0/node.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml @@ -42,10 +42,10 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - - apiGroups: [ "security.openshift.io" ] - resourceNames: [ "privileged" ] - resources: [ "securitycontextconstraints" ] - verbs: [ "use" ] + - apiGroups: ["security.openshift.io"] + resourceNames: ["privileged"] + resources: ["securitycontextconstraints"] + verbs: ["use"] --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 @@ -73,6 +73,8 @@ spec: metadata: labels: app: -node + annotations: + kubectl.kubernetes.io/default-container: driver spec: serviceAccount: -node #nodeSelector: @@ -87,7 +89,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-powermax:v2.8.0 + image: dellemc/csi-powermax:v2.11.0 imagePullPolicy: IfNotPresent env: - name: X_CSI_POWERMAX_DRIVER_NAME @@ -194,7 +196,7 @@ spec: - name: node-topology-config mountPath: /node-topology-config - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -252,8 +254,8 @@ spec: optional: true - name: powermax-config-params configMap: - name: -config-params + name: -config-params - name: node-topology-config configMap: - name: node-topology-config - optional: true + name: node-topology-config + optional: true diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..b1ece56b6 --- /dev/null +++ b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -0,0 +1,3 @@ + + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powermax/v2.8.0/upgrade-path.yaml b/operatorconfig/driverconfig/powermax/v2.8.0/upgrade-path.yaml deleted file mode 100644 index fab8efca9..000000000 --- a/operatorconfig/driverconfig/powermax/v2.8.0/upgrade-path.yaml +++ /dev/null @@ -1 +0,0 @@ -minUpgradePath: v2.7.0 diff --git a/operatorconfig/driverconfig/powerscale/v2.8.0/controller.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml similarity index 91% rename from operatorconfig/driverconfig/powerscale/v2.8.0/controller.yaml rename to operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml index 1e9a423b2..5b5c93373 100644 --- a/operatorconfig/driverconfig/powerscale/v2.8.0/controller.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml @@ -39,7 +39,7 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["csinodes"] verbs: ["get", "list", "watch", "update"] -# below for snapshotter + # below for snapshotter - apiGroups: [""] resources: ["secrets"] verbs: ["get", "list"] @@ -61,7 +61,7 @@ rules: - apiGroups: ["apiextensions.k8s.io"] resources: ["customresourcedefinitions"] verbs: ["create", "list", "watch", "delete"] - # below for resizer + # below for resizer - apiGroups: [""] resources: ["persistentvolumes"] verbs: ["update", "patch"] @@ -113,22 +113,23 @@ spec: metadata: labels: app: -controller + annotations: + kubectl.kubernetes.io/default-container: driver spec: serviceAccount: -controller affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - -controller - topologyKey: kubernetes.io/hostname - + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - -controller + topologyKey: kubernetes.io/hostname containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -145,7 +146,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -162,7 +163,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: external-health-monitor - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -182,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -215,7 +216,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -233,7 +234,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.4.0 + image: dellemc/csi-metadata-retriever:v1.7.2 imagePullPolicy: Always args: - "--csi-address=$(ADDRESS)" @@ -243,7 +244,7 @@ spec: - "--leader-election-renew-deadline=10s" - "--leader-election-lease-duration=15s" - "--leader-election-retry-period=5s" - command: [ "/csi-metadata-retriever" ] + command: ["/csi-metadata-retriever"] env: - name: ADDRESS value: /var/run/csi/csi.sock @@ -253,14 +254,10 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-isilon:v2.8.0 + image: dellemc/csi-isilon:v2.11.0 imagePullPolicy: IfNotPresent - command: [ "/csi-isilon" ] + command: ["/csi-isilon"] args: - - "--leader-election" - - "--leader-election-renew-deadline=10s" - - "--leader-election-lease-duration=15s" - - "--leader-election-retry-period=5s" - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" env: - name: CSI_ENDPOINT @@ -331,4 +328,4 @@ spec: secretName: -creds - name: csi-isilon-config-params configMap: - name: -config-params + name: -config-params diff --git a/operatorconfig/driverconfig/powerscale/v2.8.0/csidriver.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/powerscale/v2.8.0/csidriver.yaml rename to operatorconfig/driverconfig/powerscale/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/driver-config-params.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/driver-config-params.yaml new file mode 100644 index 000000000..e615ab810 --- /dev/null +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/driver-config-params.yaml @@ -0,0 +1,14 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: -config-params + namespace: +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" + PODMON_CONTROLLER_LOG_LEVEL: "debug" + PODMON_CONTROLLER_LOG_FORMAT: "TEXT" + PODMON_NODE_LOG_LEVEL: "debug" + PODMON_NODE_LOG_FORMAT: "TEXT" + diff --git a/operatorconfig/driverconfig/powerscale/v2.8.0/node.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml similarity index 95% rename from operatorconfig/driverconfig/powerscale/v2.8.0/node.yaml rename to operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml index d239c6c50..bf97a720f 100644 --- a/operatorconfig/driverconfig/powerscale/v2.8.0/node.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml @@ -30,10 +30,10 @@ rules: - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] verbs: ["get", "list", "watch", "update"] - - apiGroups: [ "security.openshift.io" ] - resourceNames: [ "privileged" ] - resources: [ "securitycontextconstraints" ] - verbs: [ "use" ] + - apiGroups: ["security.openshift.io"] + resourceNames: ["privileged"] + resources: ["securitycontextconstraints"] + verbs: ["use"] --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 @@ -61,6 +61,8 @@ spec: metadata: labels: app: -node + annotations: + kubectl.kubernetes.io/default-container: driver spec: serviceAccount: -node #nodeSelector: @@ -77,7 +79,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-isilon:v2.8.0 + image: dellemc/csi-isilon:v2.11.0 imagePullPolicy: IfNotPresent env: - name: CSI_ENDPOINT @@ -144,7 +146,7 @@ spec: - name: csi-isilon-config-params mountPath: /csi-isilon-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -212,4 +214,4 @@ spec: secretName: -creds - name: csi-isilon-config-params configMap: - name: -config-params + name: -config-params diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..b1ece56b6 --- /dev/null +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -0,0 +1,3 @@ + + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powerscale/v2.8.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerscale/v2.8.0/upgrade-path.yaml deleted file mode 100644 index 1c5489ef6..000000000 --- a/operatorconfig/driverconfig/powerscale/v2.8.0/upgrade-path.yaml +++ /dev/null @@ -1 +0,0 @@ -minUpgradePath: v2.6.0 diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml new file mode 100644 index 000000000..82524186c --- /dev/null +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml @@ -0,0 +1,272 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -controller + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +rules: + - apiGroups: ["coordination.k8s.io"] + resources: ["leases"] + verbs: ["get", "watch", "list", "delete", "update", "create"] + - apiGroups: [""] + resources: ["events"] + verbs: ["list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch"] + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["get", "list", "watch", "create", "delete", "update", "patch"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: [""] + resources: ["secrets"] + verbs: ["get", "list"] + - apiGroups: ["volumegroup.storage.dell.com"] + resources: ["dellcsivolumegroupsnapshots", "dellcsivolumegroupsnapshots/status"] + verbs: ["create", "list", "watch", "delete", "update"] + - 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: ["volumesnapshotcontents/status"] + verbs: ["update", "patch"] + - apiGroups: ["snapshot.storage.k8s.io"] + resources: ["volumesnapshots", "volumesnapshots/status"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments/status"] + verbs: ["patch"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get", "list", "watch"] + - apiGroups: ["apiextensions.k8s.io"] + resources: ["customresourcedefinitions"] + verbs: ["create", "list", "watch", "delete"] + - apiGroups: ["storage.k8s.io"] + resources: ["csinodes"] + verbs: ["get", "list", "watch"] + # below for resizer + - apiGroups: [""] + resources: ["persistentvolumeclaims/status"] + verbs: ["update", "patch"] + # Permissions for CSIStorageCapacity + - apiGroups: ["storage.k8s.io"] + resources: ["csistoragecapacities"] + verbs: ["get", "list", "watch", "create", "update", "patch", "delete"] + - apiGroups: [""] + resources: ["pods"] + verbs: ["get"] + - apiGroups: ["apps"] + resources: ["replicasets"] + verbs: ["get"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -controller +subjects: + - kind: ServiceAccount + name: -controller + namespace: +roleRef: + kind: ClusterRole + name: -controller + apiGroup: rbac.authorization.k8s.io +--- +kind: Deployment +apiVersion: apps/v1 +metadata: + name: -controller + namespace: +spec: + selector: + matchLabels: + name: -controller + replicas: 2 + template: + metadata: + labels: + name: -controller + annotations: + kubectl.kubernetes.io/default-container: driver + spec: + serviceAccountName: -controller + affinity: + podAntiAffinity: + requiredDuringSchedulingIgnoredDuringExecution: + - labelSelector: + matchExpressions: + - key: name + operator: In + values: + - -controller + topologyKey: kubernetes.io/hostname + containers: + - name: attacher + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election" + - "--worker-threads=130" + - "--resync=10s" + - "--timeout=130s" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: resizer + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--volume-name-prefix=csivol" + - "--volume-name-uuid-length=10" + - "--v=5" + - "--leader-election" + - "--default-fstype=ext4" + - "--extra-create-metadata" + - "--feature-gates=Topology=true" + - "--enable-capacity=true" + - "--capacity-ownerref-level=2" + - "--capacity-poll-interval=5m" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + - name: NAMESPACE + valueFrom: + fieldRef: + fieldPath: metadata.namespace + - name: POD_NAME + valueFrom: + fieldRef: + fieldPath: metadata.name + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: snapshotter + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + imagePullPolicy: IfNotPresent + args: + - "--csi-address=$(ADDRESS)" + - "--v=5" + - "--leader-election" + - "--snapshot-name-prefix=csisnap" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: external-health-monitor + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 + imagePullPolicy: IfNotPresent + args: + - "--v=5" + - "--csi-address=$(ADDRESS)" + - "--leader-election" + - "--http-endpoint=:8080" + - "--enable-node-watcher=true" + - "--monitor-interval=60s" + - "--timeout=180s" + - "--leader-election-renew-deadline=10s" + - "--leader-election-lease-duration=15s" + - "--leader-election-retry-period=5s" + env: + - name: ADDRESS + value: /var/run/csi/csi.sock + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: driver + image: dellemc/csi-powerstore:v2.11.0 + imagePullPolicy: IfNotPresent + command: ["/csi-powerstore"] + args: + - "--array-config=/powerstore-config/config" + - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" + env: + - name: ENABLE_TRACING + value: + - name: CSI_ENDPOINT + value: /var/run/csi/csi.sock + - name: X_CSI_MODE + value: controller + - name: X_CSI_DRIVER_NAME + value: "csi-powerstore.dellemc.com" + - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS + value: + - name: X_CSI_NFS_ACLS + value: "" + - name: X_CSI_POWERSTORE_CONFIG_PATH + value: /powerstore-config/config + - name: X_CSI_POWERSTORE_CONFIG_PARAMS_PATH + value: /powerstore-config-params/driver-config-params.yaml + - name: GOPOWERSTORE_DEBUG + value: true + - name: CSI_AUTO_ROUND_OFF_FILESYSTEM_SIZE + value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + volumeMounts: + - name: socket-dir + mountPath: /var/run/csi + - name: powerstore-config + mountPath: /powerstore-config + - name: powerstore-config-params + mountPath: /powerstore-config-params + volumes: + - name: socket-dir + emptyDir: + - name: powerstore-config-params + configMap: + name: -config-params + - name: powerstore-config + secret: + secretName: -config diff --git a/operatorconfig/driverconfig/powerstore/v2.8.0/csidriver.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/powerstore/v2.8.0/csidriver.yaml rename to operatorconfig/driverconfig/powerstore/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/powerstore/v2.8.0/driver-config-params.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/powerstore/v2.8.0/driver-config-params.yaml rename to operatorconfig/driverconfig/powerstore/v2.11.0/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml new file mode 100644 index 000000000..b1a94469b --- /dev/null +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml @@ -0,0 +1,246 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -node + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["create", "delete", "get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["security.openshift.io"] + resourceNames: ["privileged"] + resources: ["securitycontextconstraints"] + verbs: ["use"] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +subjects: + - kind: ServiceAccount + name: -node + namespace: +roleRef: + kind: ClusterRole + name: -node + apiGroup: rbac.authorization.k8s.io +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: -node + namespace: +spec: + selector: + matchLabels: + app: -node + template: + metadata: + labels: + app: -node + driver.dellemc.com: dell-storage + annotations: + kubectl.kubernetes.io/default-container: driver + spec: + #nodeSelector: + #tolerations: + serviceAccount: -node + dnsPolicy: ClusterFirstWithHostNet + hostNetwork: true + hostIPC: true + containers: + - name: driver + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + image: dellemc/csi-powerstore:v2.11.0 + imagePullPolicy: IfNotPresent + command: ["/csi-powerstore"] + args: + - "--array-config=/powerstore-config/config" + - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" + env: + - name: ENABLE_TRACING + value: + - name: CSI_ENDPOINT + value: unix:///plugins/csi-powerstore.dellemc.com/csi_sock + - name: X_CSI_MODE + value: node + - name: X_CSI_POWERSTORE_KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX + value: + - name: X_CSI_POWERSTORE_NODE_ID_PATH + value: /node-id + - name: X_CSI_POWERSTORE_MAX_VOLUMES_PER_NODE + value: + - name: X_CSI_POWERSTORE_NODE_CHROOT_PATH + value: /noderoot + - name: X_CSI_POWERSTORE_TMP_DIR + value: /plugins/csi-powerstore.dellemc.com/tmp + - name: X_CSI_DRIVER_NAME + value: "csi-powerstore.dellemc.com" + - name: X_CSI_FC_PORTS_FILTER_FILE_PATH + value: + - name: X_CSI_POWERSTORE_ENABLE_CHAP + value: "" + - name: X_CSI_POWERSTORE_CONFIG_PATH + value: /powerstore-config/config + - name: X_CSI_POWERSTORE_CONFIG_PARAMS_PATH + value: /powerstore-config-params/driver-config-params.yaml + - name: GOPOWERSTORE_DEBUG + value: "true" + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + volumeMounts: + - name: driver-path + mountPath: /plugins/csi-powerstore.dellemc.com + - name: csi-path + mountPath: /plugins/kubernetes.io/csi + mountPropagation: "Bidirectional" + - name: pods-path + mountPath: /pods + mountPropagation: "Bidirectional" + - name: dev + mountPath: /dev + - name: sys + mountPath: /sys + - name: run + mountPath: /run + - name: node-id + mountPath: /node-id + - name: etciscsi + mountPath: /etc/iscsi + - name: mpath + mountPath: /etc/multipath.conf + - name: noderoot + mountPath: /noderoot + - name: powerstore-config + mountPath: /powerstore-config + - name: powerstore-config-params + mountPath: /powerstore-config-params + - name: registrar + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + imagePullPolicy: IfNotPresent + args: + - "--v=5" + - "--csi-address=$(ADDRESS)" + - --kubelet-registration-path=/plugins/csi-powerstore.dellemc.com/csi_sock + env: + - name: ADDRESS + value: /csi/csi_sock + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + volumeMounts: + - name: registration-dir + mountPath: /registration + - name: driver-path + mountPath: /csi + volumes: + - name: registration-dir + hostPath: + path: /plugins_registry/ + type: DirectoryOrCreate + - name: driver-path + hostPath: + path: /plugins/csi-powerstore.dellemc.com + type: DirectoryOrCreate + - name: csi-path + hostPath: + path: /plugins/kubernetes.io/csi + - name: pods-path + hostPath: + path: /pods + type: Directory + - name: dev + hostPath: + path: /dev + type: Directory + - name: node-id + hostPath: + path: /etc/machine-id + type: File + - name: etciscsi + hostPath: + path: /etc/iscsi + type: DirectoryOrCreate + - name: mpath + hostPath: + path: /etc/multipath.conf + type: FileOrCreate + - name: noderoot + hostPath: + path: / + type: Directory + - name: sys + hostPath: + path: /sys + type: Directory + - name: run + hostPath: + path: /run + type: Directory + - name: powerstore-config-params + configMap: + name: -config-params + - name: powerstore-config + secret: + secretName: -config + - name: usr-bin + hostPath: + path: /usr/bin + type: Directory + - name: kubelet-pods + hostPath: + path: /var/lib/kubelet/pods + type: Directory + - name: var-run + hostPath: + path: /var/run + type: Directory diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..b1ece56b6 --- /dev/null +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -0,0 +1,3 @@ + + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml b/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml index ff6bd62bc..6f575e267 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml @@ -7,7 +7,7 @@ metadata: kind: ClusterRole apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: -controller + name: -controller rules: - apiGroups: ["coordination.k8s.io"] resources: ["leases"] @@ -20,7 +20,7 @@ rules: verbs: ["get", "list", "watch"] - apiGroups: [""] resources: ["persistentvolumes"] - verbs: ["get", "list", "watch", "create", "delete", "update","patch"] + verbs: ["get", "list", "watch", "create", "delete", "update", "patch"] - apiGroups: [""] resources: ["persistentvolumeclaims"] verbs: ["get", "list", "create", "watch", "update"] @@ -29,7 +29,7 @@ rules: verbs: ["get", "list", "watch"] - apiGroups: ["storage.k8s.io"] resources: ["volumeattachments"] - verbs: ["get", "list", "watch", "update","patch"] + verbs: ["get", "list", "watch", "update", "patch"] - apiGroups: ["storage.k8s.io"] resources: ["csinodes"] verbs: ["get", "list", "watch", "update"] @@ -42,7 +42,7 @@ rules: - apiGroups: [""] resources: ["pods"] verbs: ["get", "list", "watch"] -# below for snapshotter + # below for snapshotter - apiGroups: [""] resources: ["secrets"] verbs: ["get", "list"] @@ -106,18 +106,20 @@ spec: metadata: labels: app: -controller + annotations: + kubectl.kubernetes.io/default-container: driver spec: serviceAccountName: -controller affinity: podAntiAffinity: requiredDuringSchedulingIgnoredDuringExecution: - - labelSelector: - matchExpressions: - - key: app - operator: In - values: - - -controller - topologyKey: "kubernetes.io/hostname" + - labelSelector: + matchExpressions: + - key: app + operator: In + values: + - -controller + topologyKey: "kubernetes.io/hostname" containers: - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 @@ -253,7 +255,7 @@ spec: emptyDir: - name: unity-config configMap: - name: -config-params + name: -config-params - name: unity-secret secret: - secretName: -creds + secretName: -creds diff --git a/operatorconfig/driverconfig/unity/v2.11.0/driver-config-params.yaml b/operatorconfig/driverconfig/unity/v2.11.0/driver-config-params.yaml index 513ea7c3a..3a1c28626 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/driver-config-params.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/driver-config-params.yaml @@ -10,4 +10,4 @@ data: ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: 0 SYNC_NODE_INFO_TIME_INTERVAL: 15 - TENANT_NAME: "" + TENANT_NAME: "" \ No newline at end of file diff --git a/operatorconfig/driverconfig/unity/v2.11.0/node.yaml b/operatorconfig/driverconfig/unity/v2.11.0/node.yaml index 1e8620f58..35e7088e9 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/node.yaml @@ -63,6 +63,8 @@ spec: metadata: labels: app: -node + annotations: + kubectl.kubernetes.io/default-container: driver spec: serviceAccountName: -node hostIPC: true @@ -76,7 +78,7 @@ spec: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true image: dellemc/csi-unity:v2.11.0 - imagePullPolicy: IfNotPresent + imagePullPolicy: IfNotPresent args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" @@ -109,8 +111,6 @@ spec: value: "" - name: X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION value: "true" - - name: X_CSI_ALLOWED_NETWORKS - value: "" volumeMounts: - name: driver-path mountPath: /var/lib/kubelet/plugins/unity.emc.dell.com @@ -185,7 +185,7 @@ spec: path: cert-0 - name: unity-config configMap: - name: -config-params + name: -config-params - name: unity-secret secret: - secretName: -creds + secretName: -creds diff --git a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml index 18dba8549..b1ece56b6 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -1 +1,3 @@ -minUpgradePath: v2.10.0 + + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/unity/v2.8.0/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.8.0/upgrade-path.yaml deleted file mode 100644 index 42c1d36fb..000000000 --- a/operatorconfig/driverconfig/unity/v2.8.0/upgrade-path.yaml +++ /dev/null @@ -1 +0,0 @@ -minUpgradePath: v2.7.0 \ No newline at end of file diff --git a/pkg/modules/testdata/cr_powerflex_observability.yaml b/pkg/modules/testdata/cr_powerflex_observability.yaml index 71d62bcd8..f86262401 100644 --- a/pkg/modules/testdata/cr_powerflex_observability.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability.yaml @@ -11,13 +11,13 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.10.1" + image: "dellemc/csi-powermax:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -33,8 +33,6 @@ spec: # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - - sideCars: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor @@ -45,13 +43,11 @@ spec: value: "1" - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -62,7 +58,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -87,7 +82,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -97,7 +91,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -122,15 +115,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:3.6.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -156,7 +147,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -175,7 +165,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -183,7 +172,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: false enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true @@ -244,13 +232,12 @@ spec: # enable: Enable/Disable csm-authorization enabled: false components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.7.0 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "testing-proxy-host" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.7.0 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "testing-proxy-host" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml index 599609220..eb08478de 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml @@ -16,13 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.10.1" + image: "dellemc/csi-vxflexos:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -40,24 +40,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - sideCars: - # 'k8s' represents a string prepended to each volume created by the CSI driver + # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner args: ["--volume-name-prefix=k8s"] - - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -77,13 +74,11 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_POWERFLEX_EXTERNAL_ACCESS: Allows to specify additional entries for hostAccess of NFS volumes. Both single IP address and subnet are valid entries. # Allowed Values: x.x.x.x/xx or x.x.x.x # Default Value: None - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS value: - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -106,10 +101,8 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_APPROVE_SDC_ENABLED: Enables/Disable SDC approval # Allowed values: # true: enable SDC approval @@ -117,7 +110,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage # Allowed values: # true: enable checking of health condition of CSI volumes @@ -125,7 +117,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -133,14 +124,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # If value is zero Container Orchestrator shall decide how many volumes of this type can be published by the controller to the node. @@ -148,9 +137,6 @@ spec: # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - - - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -173,15 +159,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value - + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -207,7 +191,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -226,7 +209,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - # enabled: Enable/Disable cert-manager # Allowed values: # true: enable deployment of cert-manager @@ -234,7 +216,6 @@ spec: # Default value: false - name: cert-manager enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml index 71e5c7ba4..344b6b047 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml @@ -16,13 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.10.1" + image: "dellemc/csi-vxflexos:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -40,24 +40,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - sideCars: - # 'k8s' represents a string prepended to each volume created by the CSI driver + # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner args: ["--volume-name-prefix=k8s"] - - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -77,13 +74,11 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_POWERFLEX_EXTERNAL_ACCESS: Allows to specify additional entries for hostAccess of NFS volumes. Both single IP address and subnet are valid entries. # Allowed Values: x.x.x.x/xx or x.x.x.x # Default Value: None - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS value: - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -106,10 +101,8 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_APPROVE_SDC_ENABLED: Enables/Disable SDC approval # Allowed values: # true: enable SDC approval @@ -117,7 +110,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage # Allowed values: # true: enable checking of health condition of CSI volumes @@ -125,7 +117,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -133,14 +124,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # If value is zero Container Orchestrator shall decide how many volumes of this type can be published by the controller to the node. @@ -148,9 +137,6 @@ spec: # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - - - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -173,15 +159,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value - + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -200,14 +184,13 @@ spec: certificate: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVCVENDQXUyZ0F3SUJBZ0lVVThsYncza09ITk5QSXppRitJb3NUT3pSZVZNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2daRXhDekFKQmdOVkJBWVRBbFZUTVJFd0R3WURWUVFJREFoT1pYY2dXVzl5YXpFUk1BOEdBMVVFQnd3SQpUbVYzSUZsdmNtc3hEVEFMQmdOVkJBb01CRVJsYkd3eEREQUtCZ05WQkFzTUEwbFRSekVZTUJZR0ExVUVBd3dQClNtOXZjMlZ3Y0drSUNBZ0lDQWdJTVNVd0l3WUpLb1pJaHZjTkFRa0JGaFpxYjI5elpYQndhVjlzZFc1aFFHUmwKYkd3dVkyOXRNQjRYRFRJME1ESXlNVEU0TWpRME1sb1hEVEkwTURVeU1URTRNalEwTWxvd2daRXhDekFKQmdOVgpCQVlUQWxWVE1SRXdEd1lEVlFRSURBaE9aWGNnV1c5eWF6RVJNQThHQTFVRUJ3d0lUbVYzSUZsdmNtc3hEVEFMCkJnTlZCQW9NQkVSbGJHd3hEREFLQmdOVkJBc01BMGxUUnpFWU1CWUdBMVVFQXd3UFNtOXZjMlZ3Y0drSUNBZ0kKQ0FnSU1TVXdJd1lKS29aSWh2Y05BUWtCRmhacWIyOXpaWEJ3YVY5c2RXNWhRR1JsYkd3dVkyOXRNSUlCSWpBTgpCZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF5SXhkZ04wNDdnZk41T0h3SHFhMjlHNWd3dDkzCmVidnEwZVdnZE5RWXUvUU91YktoQ3JWYUN6QXBzTGhRcnlhOEM4OWtTM3VmRHNLM3o3aHJIRXhnblc4ZzdGL1cKTjVpaXYzcU9GcDk2ZVc4VFR5UHJhVktKV3psay9xSWhWdkhGVGxTbk5jcmJTZW45RkhxZmR4RnA3ejNVSXdtVQprZk8vTTQ1RHkrcDU2cmdqOW4vSTYvVmtpMWVxalBIN1dZTnZJQXJNa0pvZTBhSFlVSTdqa3dEZ1N6ZE1jMnM3ClI5NWxQTFY1MDgxdFNCWTJtNno0VGt1dktQdG1RZ1pML3JKL2lHUTBLVTkyYmRFUC9USDVSeEkyRHZ2U3BQSzUKUkhzTEhPVDdUZWV5NGJXU1VQemJTRzBRQUE0b1JyNTV2M1VYbmlmMExwNEQ0OU5xcHRSK0VzZkx2d0lEQVFBQgpvMU13VVRBZEJnTlZIUTRFRmdRVVlZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dId1lEVlIwakJCZ3dGb0FVCllZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dEd1lEVlIwVEFRSC9CQVV3QXdFQi96QU5CZ2txaGtpRzl3MEIKQVFzRkFBT0NBUUVBS2dWUjRvQjhlb0hNWTZ2Tm9WUERJd29NU3d2eGUyWnVDN0N0bkRvRUJjUzlrQU12TURqRwpzeFN2b0o2TXlXckpNaUt4aDJmekdGcS9FVWxDcHdKUEwvNTlTYmR3cG54UUxGWjdyZkVjMS9WQ3dOUHcxM0pEClBnZmsvZnd6QVNEcS9mWm5pTmVldHpCa2dQdEdMWDFsU051OHFNSUZHczR0QlpZZS8xNnJ4VFFpMzRsUk56QVUKMlA2YTM3YjhWVU9yRUNhTTlOdUFaY3FWSjRiODhvNXBQSkRldm5Hb3JPOHRMQWhvT3kyclB5QnJKaVhNQ0ZKMAo4TzVQS1NrSlJyQ2x1enBPeEtxUURONTlmVDdYNEp6VzI3MVhqQlIzWVdJTUdha08rSnRUdEwyUDNBWXdtd2E1CnNibUV0UU5rSjNraDhneVNVL2p4WnQrVWVUVWRJYWxDV0E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t" # privateKey: private key for cert/private-key pair -- please add cert here to use custom certificates # Allowed values: string - privateKey: + privateKey: envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -226,7 +209,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - # enabled: Enable/Disable cert-manager # Allowed values: # true: enable deployment of cert-manager @@ -234,7 +216,6 @@ spec: # Default value: false - name: cert-manager enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/pkg/modules/testdata/cr_powerflex_replica.yaml b/pkg/modules/testdata/cr_powerflex_replica.yaml index ab8752a36..3e3d0a950 100644 --- a/pkg/modules/testdata/cr_powerflex_replica.yaml +++ b/pkg/modules/testdata/cr_powerflex_replica.yaml @@ -11,42 +11,34 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true - modules: - name: replication enabled: true components: - - name: dell-csi-replicator - image: dellemc/dell-csi-replicator:v1.8.1 - envs: - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerflex" - - - - name: dell-replication-controller-manager - image: dellemc/dell-replication-controller:v1.8.1 - envs: - - name: "TARGET_CLUSTERS_IDS" - value: "test-target-cluster-1,test-target-cluster-2" - - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - - - name: "LEADER_ELECTION" - value: "true" - - - name: "RETRY_INTERVAL_MIN" - value: "1s" - - - name: "RETRY_INTERVAL_MAX" - value: "5m" + - name: dell-csi-replicator + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerflex" + - name: dell-replication-controller-manager + image: dellemc/dell-replication-controller:v1.8.1 + envs: + - name: "TARGET_CLUSTERS_IDS" + value: "test-target-cluster-1,test-target-cluster-2" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + - name: "LEADER_ELECTION" + value: "true" + - name: "RETRY_INTERVAL_MIN" + value: "1s" + - name: "RETRY_INTERVAL_MAX" + value: "5m" diff --git a/pkg/modules/testdata/cr_powerflex_resiliency.yaml b/pkg/modules/testdata/cr_powerflex_resiliency.yaml index 23af5a811..e1c028e67 100644 --- a/pkg/modules/testdata/cr_powerflex_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerflex_resiliency.yaml @@ -11,12 +11,11 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -60,4 +59,3 @@ spec: - "--csisock=unix:/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - "--mode=node" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - diff --git a/pkg/modules/testdata/cr_powermax_observability.yaml b/pkg/modules/testdata/cr_powermax_observability.yaml index ab8b6b9eb..b4ec2de7e 100644 --- a/pkg/modules/testdata/cr_powermax_observability.yaml +++ b/pkg/modules/testdata/cr_powermax_observability.yaml @@ -6,13 +6,12 @@ metadata: spec: driver: csiDriverType: "powermax" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: test-powermax-creds replicas: 1 common: - image: "dellemc/csi-powermax:v2.10.1" + image: "dellemc/csi-powermax:v2.11.0" imagePullPolicy: IfNotPresent - modules: # observability: allows to configure observability - name: observability @@ -20,92 +19,89 @@ spec: enabled: true configVersion: v1.8.1 components: - - name: topology - # enabled: Enable/Disable topology - enabled: true - # image: Defines karavi-topology image. This shouldn't be changed - # Allowed values: string - image: dellemc/csm-topology:v1.8.1 - envs: - # topology log level - # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC - # Default value: "INFO" - - name: "TOPOLOGY_LOG_LEVEL" - value: "INFO" - - - name: otel-collector - # enabled: Enable/Disable OpenTelemetry Collector - enabled: true - # image: Defines otel-collector image. This shouldn't be changed - # Allowed values: string - image: otel/opentelemetry-collector:0.42.0 - envs: - # image of nginx proxy image + - name: topology + # enabled: Enable/Disable topology + enabled: true + # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - # Default value: "nginxinc/nginx-unprivileged:1.20" - - name: "NGINX_PROXY_IMAGE" - value: "nginxinc/nginx-unprivileged:1.20" - - - name: metrics-powermax - # enabled: Enable/Disable PowerMax metrics - enabled: true - # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.3.1 - envs: - # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax - # Allowed values: int - # Default value: 10 - - name: "POWERMAX_MAX_CONCURRENT_QUERIES" - value: "10" - # POWERMAX_CAPACITY_METRICS_ENABLED: enable/disable collection of capacity metrics - # Allowed values: ture, false - # Default value: true - - name: "POWERMAX_CAPACITY_METRICS_ENABLED" - value: "true" - # POWERMAX_PERFORMANCE_METRICS_ENABLED: enable/disable collection of volume performance metrics - # Allowed values: ture, false - # Default value: true - - name: "POWERMAX_PERFORMANCE_METRICS_ENABLED" - value: "true" - # POWERMAX_CAPACITY_POLL_FREQUENCY: set polling frequency to get capacity metrics data - # Allowed values: int - # Default value: 10 - - name: "POWERMAX_CAPACITY_POLL_FREQUENCY" - value: "10" - # POWERMAX_PERFORMANCE_POLL_FREQUENCY: set polling frequency to get volume performance data - # Allowed values: int - # Default value: 10 - - name: "POWERMAX_PERFORMANCE_POLL_FREQUENCY" - value: "10" - # PowerMax metrics log level - # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC - # Default value: "INFO" - - name: "POWERMAX_LOG_LEVEL" - value: "INFO" - # PowerMax Metrics Output logs in the specified format - # Valid values: TEXT, JSON - # Default value: "TEXT" - - name: "POWERMAX_LOG_FORMAT" - value: "TEXT" - # otel collector address - # Allowed values: String - # Default value: "otel-collector:55680" - - name: "COLLECTOR_ADDRESS" - value: "otel-collector:55680" - # configMap name which has all array/endpoint related info - - name: "X_CSI_CONFIG_MAP_NAME" - value: "powermax-reverseproxy-config" + image: dellemc/csm-topology:v1.8.1 + envs: + # topology log level + # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC + # Default value: "INFO" + - name: "TOPOLOGY_LOG_LEVEL" + value: "INFO" + - name: otel-collector + # enabled: Enable/Disable OpenTelemetry Collector + enabled: true + # image: Defines otel-collector image. This shouldn't be changed + # Allowed values: string + image: otel/opentelemetry-collector:0.42.0 + envs: + # image of nginx proxy image + # Allowed values: string + # Default value: "nginxinc/nginx-unprivileged:1.20" + - name: "NGINX_PROXY_IMAGE" + value: "nginxinc/nginx-unprivileged:1.20" + - name: metrics-powermax + # enabled: Enable/Disable PowerMax metrics + enabled: true + # image: Defines PowerMax metrics image. This shouldn't be changed + image: dellemc/csm-metrics-powermax:v1.3.1 + envs: + # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax + # Allowed values: int + # Default value: 10 + - name: "POWERMAX_MAX_CONCURRENT_QUERIES" + value: "10" + # POWERMAX_CAPACITY_METRICS_ENABLED: enable/disable collection of capacity metrics + # Allowed values: ture, false + # Default value: true + - name: "POWERMAX_CAPACITY_METRICS_ENABLED" + value: "true" + # POWERMAX_PERFORMANCE_METRICS_ENABLED: enable/disable collection of volume performance metrics + # Allowed values: ture, false + # Default value: true + - name: "POWERMAX_PERFORMANCE_METRICS_ENABLED" + value: "true" + # POWERMAX_CAPACITY_POLL_FREQUENCY: set polling frequency to get capacity metrics data + # Allowed values: int + # Default value: 10 + - name: "POWERMAX_CAPACITY_POLL_FREQUENCY" + value: "10" + # POWERMAX_PERFORMANCE_POLL_FREQUENCY: set polling frequency to get volume performance data + # Allowed values: int + # Default value: 10 + - name: "POWERMAX_PERFORMANCE_POLL_FREQUENCY" + value: "10" + # PowerMax metrics log level + # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC + # Default value: "INFO" + - name: "POWERMAX_LOG_LEVEL" + value: "INFO" + # PowerMax Metrics Output logs in the specified format + # Valid values: TEXT, JSON + # Default value: "TEXT" + - name: "POWERMAX_LOG_FORMAT" + value: "TEXT" + # otel collector address + # Allowed values: String + # Default value: "otel-collector:55680" + - name: "COLLECTOR_ADDRESS" + value: "otel-collector:55680" + # configMap name which has all array/endpoint related info + - name: "X_CSI_CONFIG_MAP_NAME" + value: "powermax-reverseproxy-config" - name: authorization # enable: Enable/Disable csm-authorization enabled: false components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "testing-proxy-host" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "testing-proxy-host" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/pkg/modules/testdata/cr_powermax_replica.yaml b/pkg/modules/testdata/cr_powermax_replica.yaml index b83a0ad8e..87c59c885 100644 --- a/pkg/modules/testdata/cr_powermax_replica.yaml +++ b/pkg/modules/testdata/cr_powermax_replica.yaml @@ -18,13 +18,12 @@ metadata: spec: driver: csiDriverType: "powermax" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: test-powermax-creds replicas: 1 common: - image: "dellemc/csi-powermax:v2.10.1" + image: "dellemc/csi-powermax:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: replication enabled: true @@ -36,25 +35,18 @@ spec: value: "replication.storage.dell.com/" - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" value: "powermax/" - - - name: dell-replication-controller-manager image: dellemc/dell-replication-controller:v1.8.1 envs: - name: "TARGET_CLUSTERS_IDS" value: "test-target-cluster-1,test-target-cluster-2" - - name: "REPLICATION_CTRL_LOG_LEVEL" value: "debug" - - name: "REPLICATION_CTRL_REPLICAS" value: "1" - - name: "LEADER_ELECTION" value: "true" - - name: "RETRY_INTERVAL_MIN" value: "1s" - - name: "RETRY_INTERVAL_MAX" value: "5m" diff --git a/pkg/modules/testdata/cr_powermax_reverseproxy.yaml b/pkg/modules/testdata/cr_powermax_reverseproxy.yaml index 0e0805f62..7796786fc 100644 --- a/pkg/modules/testdata/cr_powermax_reverseproxy.yaml +++ b/pkg/modules/testdata/cr_powermax_reverseproxy.yaml @@ -18,13 +18,12 @@ metadata: spec: driver: csiDriverType: "powermax" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: powermax-creds replicas: 1 common: - image: "dellemc/csi-powermax:v2.10.1" + image: "dellemc/csi-powermax:v2.11.0" imagePullPolicy: IfNotPresent - modules: # CSI Powermax Reverseproxy is a mandatory module - name: "csireverseproxy" @@ -60,4 +59,4 @@ spec: value: "testing-proxy-host" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" \ No newline at end of file + value: "true" diff --git a/pkg/modules/testdata/cr_powerscale_auth.yaml b/pkg/modules/testdata/cr_powerscale_auth.yaml index 0b220c7cf..b8f3758a8 100644 --- a/pkg/modules/testdata/cr_powerscale_auth.yaml +++ b/pkg/modules/testdata/cr_powerscale_auth.yaml @@ -6,25 +6,23 @@ metadata: spec: driver: csiDriverType: "isilon" - configVersion: v2.10.1 - authSecret: isilon-creds-custom + configVersion: v2.11.0 + authSecret: isilon-creds-custom replicas: 1 common: - image: "dellemc/csi-isilon:v2.10.1" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: authorization # enable: Enable/Disable csm-authorization enabled: true components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "testing-proxy-host" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "testing-proxy-host" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml b/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml index 6b1636083..63db4c92c 100644 --- a/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml +++ b/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml @@ -6,25 +6,23 @@ metadata: spec: driver: csiDriverType: "isilon" - configVersion: v2.10.1 - authSecret: isilon-creds-custom + configVersion: v2.11.0 + authSecret: isilon-creds-custom replicas: 1 common: - image: "dellemc/csi-isilon:v2.10.1" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: authorization # enable: Enable/Disable csm-authorization enabled: true components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "testing-proxy-host" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "false" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "testing-proxy-host" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "false" diff --git a/pkg/modules/testdata/cr_powerscale_observability.yaml b/pkg/modules/testdata/cr_powerscale_observability.yaml index d227c4f1d..638a828c8 100644 --- a/pkg/modules/testdata/cr_powerscale_observability.yaml +++ b/pkg/modules/testdata/cr_powerscale_observability.yaml @@ -1,129 +1,124 @@ -apiVersion: storage.dell.com/v1 -kind: ContainerStorageModule -metadata: - name: isilon - namespace: isilon -spec: - driver: - csiDriverType: "isilon" - configVersion: v2.10.1 - authSecret: isilon-creds - replicas: 1 - common: - image: "dellemc/csi-isilon:v2.10.1" - imagePullPolicy: IfNotPresent - - modules: - # observability: allows to configure observability - - name: observability - # enabled: Enable/Disable observability - enabled: true - configVersion: v1.8.1 - components: - - name: topology - # enabled: Enable/Disable topology - enabled: true - # image: Defines karavi-topology image. This shouldn't be changed - # Allowed values: string - image: dellemc/csm-topology:v1.8.1 - envs: - # topology log level - # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC - # Default value: "INFO" - - name: "TOPOLOGY_LOG_LEVEL" - value: "INFO" - - - name: otel-collector - # enabled: Enable/Disable OpenTelemetry Collector - enabled: false - # image: Defines otel-collector image. This shouldn't be changed - # Allowed values: string - image: otel/opentelemetry-collector:0.42.0 - envs: - # image of nginx proxy image - # Allowed values: string - # Default value: "nginxinc/nginx-unprivileged:1.20" - - name: "NGINX_PROXY_IMAGE" - value: "nginxinc/nginx-unprivileged:1.20" - - - name: metrics-powerscale - # enabled: Enable/Disable PowerScale metrics - enabled: true - # image: Defines PowerScale metrics image. This shouldn't be changed - # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 - envs: - # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale - # Allowed values: int - # Default value: 10 - - name: "POWERSCALE_MAX_CONCURRENT_QUERIES" - value: "10" - # POWERSCALE_CAPACITY_METRICS_ENABLED: enable/disable collection of capacity metrics - # Allowed values: ture, false - # Default value: true - - name: "POWERSCALE_CAPACITY_METRICS_ENABLED" - value: "true" - # POWERSCALE_PERFORMANCE_METRICS_ENABLED: enable/disable collection of performance metrics - # Allowed values: ture, false - # Default value: true - - name: "POWERSCALE_PERFORMANCE_METRICS_ENABLED" - value: "true" - # POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY: set polling frequency to get cluster capacity metrics data - # Allowed values: int - # Default value: 30 - - name: "POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY" - value: "30" - # POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY: set polling frequency to get cluster performance metrics data - # Allowed values: int - # Default value: 20 - - name: "POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY" - value: "20" - # POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY: set polling frequency to get Quota capacity metrics data - # Allowed values: int - # Default value: 20 - - name: "POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY" - value: "30" - # ISICLIENT_INSECURE: set true/false to skip/verify OneFS API server's certificates - # Allowed values: ture, false - # Default value: true - - name: "ISICLIENT_INSECURE" - value: "true" - # ISICLIENT_AUTH_TYPE: set 0/1 to enables session-based/basic Authentication - # Allowed values: ture, false - # Default value: true - - name: "ISICLIENT_AUTH_TYPE" - value: "1" - # ISICLIENT_VERBOSE: set 0/1/2 decide High/Medium/Low content of the OneFS REST API message should be logged in debug level logs - # Allowed values: 0,1,2 - # Default value: 0 - - name: "ISICLIENT_VERBOSE" - value: "0" - # PowerScale metrics log level - # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC - # Default value: "INFO" - - name: "POWERSCALE_LOG_LEVEL" - value: "INFO" - # PowerScale Metrics Output logs in the specified format - # Valid values: TEXT, JSON - # Default value: "TEXT" - - name: "POWERSCALE_LOG_FORMAT" - value: "TEXT" - # Otel collector address - # Allowed values: String - # Default value: "otel-collector:55680" - - name: "COLLECTOR_ADDRESS" - value: "otel-collector:55680" - - name: authorization - # enable: Enable/Disable csm-authorization - enabled: false - components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "testing-proxy-host" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" +apiVersion: storage.dell.com/v1 +kind: ContainerStorageModule +metadata: + name: isilon + namespace: isilon +spec: + driver: + csiDriverType: "isilon" + configVersion: v2.11.0 + authSecret: isilon-creds + replicas: 1 + common: + image: "dellemc/csi-isilon:v2.11.0" + imagePullPolicy: IfNotPresent + modules: + # observability: allows to configure observability + - name: observability + # enabled: Enable/Disable observability + enabled: true + configVersion: v1.8.1 + components: + - name: topology + # enabled: Enable/Disable topology + enabled: true + # image: Defines karavi-topology image. This shouldn't be changed + # Allowed values: string + image: dellemc/csm-topology:v1.8.1 + envs: + # topology log level + # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC + # Default value: "INFO" + - name: "TOPOLOGY_LOG_LEVEL" + value: "INFO" + - name: otel-collector + # enabled: Enable/Disable OpenTelemetry Collector + enabled: false + # image: Defines otel-collector image. This shouldn't be changed + # Allowed values: string + image: otel/opentelemetry-collector:0.42.0 + envs: + # image of nginx proxy image + # Allowed values: string + # Default value: "nginxinc/nginx-unprivileged:1.20" + - name: "NGINX_PROXY_IMAGE" + value: "nginxinc/nginx-unprivileged:1.20" + - name: metrics-powerscale + # enabled: Enable/Disable PowerScale metrics + enabled: true + # image: Defines PowerScale metrics image. This shouldn't be changed + # Allowed values: string + image: dellemc/csm-metrics-powerscale:v1.5.1 + envs: + # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale + # Allowed values: int + # Default value: 10 + - name: "POWERSCALE_MAX_CONCURRENT_QUERIES" + value: "10" + # POWERSCALE_CAPACITY_METRICS_ENABLED: enable/disable collection of capacity metrics + # Allowed values: true, false + # Default value: true + - name: "POWERSCALE_CAPACITY_METRICS_ENABLED" + value: "true" + # POWERSCALE_PERFORMANCE_METRICS_ENABLED: enable/disable collection of performance metrics + # Allowed values: true, false + # Default value: true + - name: "POWERSCALE_PERFORMANCE_METRICS_ENABLED" + value: "true" + # POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY: set polling frequency to get cluster capacity metrics data + # Allowed values: int + # Default value: 30 + - name: "POWERSCALE_CLUSTER_CAPACITY_POLL_FREQUENCY" + value: "30" + # POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY: set polling frequency to get cluster performance metrics data + # Allowed values: int + # Default value: 20 + - name: "POWERSCALE_CLUSTER_PERFORMANCE_POLL_FREQUENCY" + value: "20" + # POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY: set polling frequency to get Quota capacity metrics data + # Allowed values: int + - name: "POWERSCALE_QUOTA_CAPACITY_POLL_FREQUENCY" + value: "30" + # ISICLIENT_INSECURE: set true/false to skip/verify OneFS API server's certificates + # Allowed values: true, false + # Default value: true + - name: "ISICLIENT_INSECURE" + value: "true" + # ISICLIENT_AUTH_TYPE: set 0/1 to enables session-based/basic Authentication + # Allowed values: true, false + # Default value: true + - name: "ISICLIENT_AUTH_TYPE" + value: "1" + # ISICLIENT_VERBOSE: set 0/1/2 decide High/Medium/Low content of the OneFS REST API message should be logged in debug level logs + # Allowed values: 0,1,2 + # Default value: 0 + - name: "ISICLIENT_VERBOSE" + value: "0" + # PowerScale metrics log level + # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC + # Default value: "INFO" + - name: "POWERSCALE_LOG_LEVEL" + value: "INFO" + # PowerScale Metrics Output logs in the specified format + # Valid values: TEXT, JSON + # Default value: "TEXT" + - name: "POWERSCALE_LOG_FORMAT" + value: "TEXT" + # Otel collector address + # Allowed values: String + # Default value: "otel-collector:55680" + - name: "COLLECTOR_ADDRESS" + value: "otel-collector:55680" + - name: authorization + # enable: Enable/Disable csm-authorization + enabled: false + components: + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "testing-proxy-host" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/pkg/modules/testdata/cr_powerscale_replica.yaml b/pkg/modules/testdata/cr_powerscale_replica.yaml index c7bbb96ff..d433fc60b 100644 --- a/pkg/modules/testdata/cr_powerscale_replica.yaml +++ b/pkg/modules/testdata/cr_powerscale_replica.yaml @@ -6,43 +6,35 @@ metadata: spec: driver: csiDriverType: "isilon" - configVersion: v2.10.1 - authSecret: isilon-creds + configVersion: v2.11.0 + authSecret: isilon-creds replicas: 1 common: - image: "dellemc/csi-isilon:v2.10.1" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: replication enabled: true components: - - name: dell-csi-replicator - image: dellemc/dell-csi-replicator:v1.8.1 - envs: - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - - name: dell-replication-controller-manager - image: dellemc/dell-replication-controller:v1.8.1 - envs: - - name: "TARGET_CLUSTERS_IDS" - value: "test-target-cluster-1,test-target-cluster-2" - - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - - - name: "LEADER_ELECTION" - value: "true" - - - name: "RETRY_INTERVAL_MIN" - value: "1s" - - - name: "RETRY_INTERVAL_MAX" - value: "5m" + - name: dell-csi-replicator + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + image: dellemc/dell-replication-controller:v1.8.1 + envs: + - name: "TARGET_CLUSTERS_IDS" + value: "test-target-cluster-1,test-target-cluster-2" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + - name: "LEADER_ELECTION" + value: "true" + - name: "RETRY_INTERVAL_MIN" + value: "1s" + - name: "RETRY_INTERVAL_MAX" + value: "5m" diff --git a/pkg/modules/testdata/cr_powerscale_resiliency.yaml b/pkg/modules/testdata/cr_powerscale_resiliency.yaml index cf3356115..54589bd4a 100644 --- a/pkg/modules/testdata/cr_powerscale_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerscale_resiliency.yaml @@ -6,13 +6,12 @@ metadata: spec: driver: csiDriverType: "isilon" - configVersion: v2.10.1 - authSecret: isilon-creds-custom + configVersion: v2.11.0 + authSecret: isilon-creds-custom replicas: 1 common: - image: "dellemc/csi-isilon:v2.10.1" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature diff --git a/pkg/modules/testdata/cr_powerstore_resiliency.yaml b/pkg/modules/testdata/cr_powerstore_resiliency.yaml index 4e088b35e..4067f0687 100644 --- a/pkg/modules/testdata/cr_powerstore_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerstore_resiliency.yaml @@ -6,13 +6,12 @@ metadata: spec: driver: csiDriverType: "powerstore" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: powerstore-creds replicas: 1 common: - image: "dellemc/csi-powerstore:v2.10.1" + image: "dellemc/csi-powerstore:v2.11.0" imagePullPolicy: IfNotPresent - modules: - name: resiliency configVersion: "v1.9.1" @@ -49,4 +48,4 @@ spec: - "--leaderelection=false" - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - - "--ignoreVolumelessPods=false" \ No newline at end of file + - "--ignoreVolumelessPods=false" diff --git a/samples/storage_csm_powerflex_v280.yaml b/samples/storage_csm_powerflex_v2110.yaml similarity index 73% rename from samples/storage_csm_powerflex_v280.yaml rename to samples/storage_csm_powerflex_v2110.yaml index 69dffafaf..804a54928 100644 --- a/samples/storage_csm_powerflex_v280.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -16,13 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.8.0 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - image: "dellemc/csi-vxflexos:v2.8.0" + image: "dellemc/csi-vxflexos:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -40,27 +40,36 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - sideCars: - # 'k8s' represents a string prepended to each volume created by the CSI driver + # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 args: ["--volume-name-prefix=k8s"] - - # sdc-monitor is disabled by default, due to high CPU usage + - 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 + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false - image: dellemc/sdc:3.6.1 + image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #do not add mdm value here if it is present in secret + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false 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 when the storageCapacity is set as "true" # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m @@ -77,7 +86,11 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - + # X_CSI_POWERFLEX_EXTERNAL_ACCESS: Allows to specify additional entries for hostAccess of NFS volumes. Both single IP address and subnet are valid entries. + # Allowed Values: x.x.x.x/xx or x.x.x.x + # Default Value: None + - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS + value: #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -100,10 +113,8 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_APPROVE_SDC_ENABLED: Enables/Disable SDC approval # Allowed values: # true: enable SDC approval @@ -111,7 +122,13 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -119,14 +136,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # If value is zero Container Orchestrator shall decide how many volumes of this type can be published by the controller to the node. @@ -134,9 +149,6 @@ spec: # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - - - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -159,64 +171,41 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - # Uncomment if CSM for Resiliency and CSI Driver pods monitor is enabled - # - key: "offline.vxflexos.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "vxflexos.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "offline.unity.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "unity.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "offline.isilon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "isilon.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - initContainers: - - image: dellemc/sdc:3.6.1 + - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value - + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.8.0 + configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.8.0 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.6.0 + configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.6.0 + image: dellemc/csm-topology:v1.8.1 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -231,7 +220,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -252,7 +240,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - # enabled: Enable/Disable cert-manager # Allowed values: # true: enable deployment of cert-manager @@ -260,12 +247,11 @@ spec: # Default value: false - name: cert-manager enabled: false - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.6.0 + image: dellemc/csm-metrics-powerflex:v1.8.1 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -317,7 +303,6 @@ spec: # Default value: "otel-collector:55680" - name: "COLLECTOR_ADDRESS" value: "otel-collector:55680" - # Replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -327,55 +312,52 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.6.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.6.0 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature - # Allowed values: string - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerflex" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerflex" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" - name: resiliency # enabled: Enable/Disable Resiliency feature # Allowed values: @@ -383,10 +365,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.7.0 + configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -400,7 +382,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powermax_v280.yaml b/samples/storage_csm_powermax_v2110.yaml similarity index 77% rename from samples/storage_csm_powermax_v280.yaml rename to samples/storage_csm_powermax_v2110.yaml index 2c2eb424b..2c163b3ad 100644 --- a/samples/storage_csm_powermax_v280.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerMax v2.8.0 driver - configVersion: v2.8.0 + configVersion: v2.11.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -44,8 +43,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerMax driver v2.8.0 - image: dellemc/csi-powermax:v2.8.0 + image: dellemc/csi-powermax:v2.11.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -215,59 +213,67 @@ 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:v4.0.0 args: ["--volume-name-prefix=pmax"] + - 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: false - 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 - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - + 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" + # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] modules: # CSI Powermax Reverseproxy is a mandatory module for Powermax - name: csireverseproxy # enabled: Always set to true enabled: true forceRemoveModule: true - configVersion: v2.7.0 + configVersion: v2.9.1 components: - - name: csipowermax-reverseproxy - # image: Define the container images used for the reverse proxy - # Default value: None - # Example: "csipowermax-reverseproxy:v2.7.0" - image: dellemc/csipowermax-reverseproxy:v2.7.0 - envs: - # "tlsSecret" defines the TLS secret that is created with certificate - # and its associated key + - name: csipowermax-reverseproxy + # image: Define the container images used for the reverse proxy # Default value: None - # Example: "tls-secret" - - name: X_CSI_REVPROXY_TLS_SECRET - value: "csirevproxy-tls-secret" - - name: X_CSI_REVPROXY_PORT - value: "2222" - - name: X_CSI_CONFIG_MAP_NAME - value: "powermax-reverseproxy-config" - + # 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 + # Default value: None + # Example: "tls-secret" + - name: X_CSI_REVPROXY_TLS_SECRET + value: "csirevproxy-tls-secret" + - name: X_CSI_REVPROXY_PORT + value: "2222" + - name: X_CSI_CONFIG_MAP_NAME + value: "powermax-reverseproxy-config" # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization enabled: false - configVersion: v1.8.0 + configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.8.0 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # Replication: allows configuring replication module # Replication CRDs must be installed before installing driver - name: replication @@ -277,67 +283,65 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.6.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.6.0 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature - # Allowed values: string - # Default value: powermax - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powermax" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powermax + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powermax" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.6.0 + configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.6.0 + image: dellemc/csm-topology:v1.8.1 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -352,7 +356,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -373,7 +376,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -381,12 +383,11 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: false enabled: false - - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.1.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/samples/storage_csm_powerscale_v280.yaml b/samples/storage_csm_powerscale_v2110.yaml similarity index 65% rename from samples/storage_csm_powerscale_v280.yaml rename to samples/storage_csm_powerscale_v2110.yaml index 602c4bfb0..494df1280 100644 --- a/samples/storage_csm_powerscale_v280.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -16,16 +16,14 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerScale v2.8.0 driver - configVersion: v2.8.0 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet # Uninstall CSI Driver and/or modules when CR is deleted forceRemoveDriver: true common: - # Image for CSI PowerScale driver v2.8.0 - image: "dellemc/csi-isilon:v2.8.0" + image: "dellemc/csi-isilon:v2.11.0" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs @@ -36,14 +34,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -52,7 +48,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -60,7 +55,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -68,7 +62,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -78,7 +71,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_ISI_AUTH_TYPE: Specify the authentication method to be used. # Allowed values: # 0: basic authentication @@ -86,7 +78,6 @@ spec: # Default value: 0 - name: X_CSI_ISI_AUTH_TYPE value: "0" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -96,77 +87,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: /var/lib/kubelet - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -184,42 +165,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -246,57 +222,46 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - # Uncomment if CSM for Resiliency and CSI Driver pods monitor is enabled - # - key: "offline.vxflexos.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "vxflexos.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "offline.unity.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "unity.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "offline.isilon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - # - key: "isilon.podmon.storage.dell.com" - # operator: "Exists" - # effect: "NoSchedule" - sideCars: - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 args: ["--volume-name-prefix=csipscale"] + - 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: false 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" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - + 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 when the storageCapacity is set as "true" + # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] modules: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.8.0 + configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.8.0 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -306,68 +271,65 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.6.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.6.0 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters - # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "TARGET_CLUSTERS_IDS" - value: "target-cluster-1" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - name: "RETRY_INTERVAL_MAX" - value: "5m" - + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "target-cluster-1" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - name: "RETRY_INTERVAL_MAX" + value: "5m" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.6.0 + configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.6.0 + image: dellemc/csm-topology:v1.8.1 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -382,7 +344,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -403,21 +364,19 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager - # enabled: Enable/Disable cert-manager - # Allowed values: - # true: enable deployment of cert-manager - # false: disable deployment of cert-manager only if it's already deployed - # Default value: false + # enabled: Enable/Disable cert-manager + # Allowed values: + # true: enable deployment of cert-manager + # false: disable deployment of cert-manager only if it's already deployed + # Default value: false enabled: false - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.3.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 @@ -486,10 +445,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.7.0 + configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.6.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -504,7 +463,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.6.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerstore_v280.yaml b/samples/storage_csm_powerstore_v2110.yaml similarity index 88% rename from samples/storage_csm_powerstore_v280.yaml rename to samples/storage_csm_powerstore_v2110.yaml index f8dd2c258..92a188cc9 100644 --- a/samples/storage_csm_powerstore_v280.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerStore v2.8.0 driver - configVersion: v2.8.0 + configVersion: v2.11.0 # authSecret: This is the secret used to validate the default PowerStore secret used for installation # Allowed values: -config # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config @@ -43,8 +42,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerStore driver v2.8.0 - image: "dellemc/csi-powerstore:v2.8.0" + image: "dellemc/csi-powerstore:v2.11.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX @@ -58,22 +56,31 @@ spec: value: /var/lib/kubelet - name: CSI_LOG_LEVEL value: debug - sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 args: ["--volume-name-prefix=csivol"] - + - 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: false 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 - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] + 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" + # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] controller: envs: @@ -106,8 +113,7 @@ spec: # Allowed Values: x.x.x.x/xx or x.x.x.x # Default Value: - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS - value: - + value: # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -144,7 +150,6 @@ spec: # Default value: "0" - name: X_CSI_POWERSTORE_MAX_VOLUMES_PER_NODE value: "0" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -163,7 +168,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -172,10 +176,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.7.0 + configVersion: v1.9.1 components: - name: podmon-controller - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powerstore" @@ -190,7 +194,7 @@ spec: - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPath=csi-powerstore.dellemc.com" - name: podmon-node - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.9.1 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_unity_v2110.yaml b/samples/storage_csm_unity_v2110.yaml index 787917c08..02974284d 100644 --- a/samples/storage_csm_unity_v2110.yaml +++ b/samples/storage_csm_unity_v2110.yaml @@ -28,10 +28,10 @@ spec: image: "dellemc/csi-unity:v2.11.0" imagePullPolicy: IfNotPresent envs: - # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. - # Allowed values: boolean - # Default value: "false" - # Examples : "true" , "false" + # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. + # Allowed values: boolean + # Default value: "false" + # Examples : "true" , "false" - name: X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS value: "false" - name: X_CSI_EPHEMERAL_STAGING_PATH @@ -83,7 +83,6 @@ spec: # Default value: true - name: X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION value: "true" - sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner @@ -99,14 +98,14 @@ spec: image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 - name: csi-metadata-retriever image: dellemc/csi-metadata-retriever:v1.7.2 - # 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 - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] + enabled: false args: ["--monitor-interval=60s"] image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 @@ -141,7 +140,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # X_CSI_ALLOWED_NETWORKS: Custom networks for Unity export # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. # Allowed values: list of one or more networks @@ -151,7 +149,6 @@ spec: # eg: "192.168.1.0/24 192.168.100.0/22" - name: X_CSI_ALLOWED_NETWORKS value: "" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -166,7 +163,7 @@ spec: # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" +# Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint +# - key: "node-role.kubernetes.io/control-plane" +# operator: "Exists" +# effect: "NoSchedule" diff --git a/samples/storage_csm_unity_v280.yaml b/samples/storage_csm_unity_v280.yaml deleted file mode 100644 index d836e7234..000000000 --- a/samples/storage_csm_unity_v280.yaml +++ /dev/null @@ -1,145 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: ContainerStorageModule -metadata: - name: unity - namespace: unity -spec: - driver: - csiDriverType: "unity" - csiDriverSpec: - # fsGroupPolicy: Defines if the underlying volume supports changing ownership and permission of the volume before being mounted. - # Allowed values: ReadWriteOnceWithFSType, File , None - # Default value: ReadWriteOnceWithFSType - fSGroupPolicy: "ReadWriteOnceWithFSType" - # storageCapacity: Helps the scheduler to schedule the pod on a node satisfying the topology constraints, only if the requested capacity is available on the storage array - # Allowed values: - # true: enable storage capacity tracking - # false: disable storage capacity tracking - storageCapacity: true - # Config version for CSI Unity v2.8.0 driver - configVersion: v2.8.0 - # Controller count - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - forceRemoveDriver: true - common: - # Image for CSI Unity driver v2.8.0 - image: "dellemc/csi-unity:v2.8.0" - imagePullPolicy: IfNotPresent - envs: - # X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - Flag to enable sharing of volumes across multiple pods within the same node in RWO access mode. - # Allowed values: boolean - # Default value: "false" - # Examples : "true" , "false" - - name: X_CSI_UNITY_ALLOW_MULTI_POD_ACCESS - value: "false" - - name: X_CSI_EPHEMERAL_STAGING_PATH - value: "/var/lib/kubelet/plugins/kubernetes.io/csi/pv/" - # X_CSI_ISCSI_CHROOT is the path to which the driver will chroot before - # running any iscsi commands. This value should only be set when instructed - # by technical support - - name: X_CSI_ISCSI_CHROOT - value: "/noderoot" - # X_CSI_UNITY_SYNC_NODEINFO_INTERVAL - Time interval to add node info to array. Default 15 minutes. Minimum value should be 1. - # Allowed values: integer - # Default value: 15 - # Examples : 0 , 2 - - name: X_CSI_UNITY_SYNC_NODEINFO_INTERVAL - value: "15" - # Specify kubelet config dir path. - # Ensure that the config.yaml file is present at this path. - # Default value: /var/lib/kubelet - - name: KUBELET_CONFIG_DIR - value: /var/lib/kubelet - # CSI_LOG_LEVEL is used to set the logging level of the driver. - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "info" - - name: CSI_LOG_LEVEL - value: debug - # TENANT_NAME - Tenant name that need to added while adding host entry to the array. - # Allowed values: string - # Default value: "" - # Examples : "tenant2" , "tenant3" - - name: TENANT_NAME - value: "" - # CERT_SECRET_COUNT: Represents number of certificate secrets, which user is going to create for - # ssl authentication. (unity-cert-0..unity-cert-n) - # This field is only verified if X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION is set to false - # Allowed values: n, where n > 0 - # Default value: None - - name: CERT_SECRET_COUNT - value: "1" - # X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION: Specifies if the driver is going to validate unisphere certs while connecting to the Unisphere REST API interface. - # If it is set to false, then a secret unity-certs has to be created with an X.509 certificate of CA which signed the Unisphere certificate - # Allowed values: - # true: skip Unisphere API server's certificate verification - # false: verify Unisphere API server's certificates - # Default value: true - - name: X_CSI_UNITY_SKIP_CERTIFICATE_VALIDATION - value: "true" - - sideCars: - # 'csivol' represents a string prepended to each volume created by the CSI driver - - name: provisioner - args: ["--volume-name-prefix=csivol"] - - # health monitor is disabled by default, refer to driver documentation before enabling it - - name: external-health-monitor - enabled: false - 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" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] - controller: - envs: - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # node-role.kubernetes.io/control-plane: "" - - # tolerations: Define tolerations for the controllers, if required. - # Leave as blank to install controller on worker nodes - # Default value: None - tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" - node: - envs: - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # nodeSelector: Define node selection constraints for node pods. - # For the pod to be eligible to run on a node, the node must have each - # of the indicated key-value pairs as labels. - # Leave as blank to consider all nodes - # Allowed values: map of key-value pairs - # Default value: None - nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # node-role.kubernetes.io/control-plane: "" - - # tolerations: Define tolerations for the controllers, if required. - # Leave as blank to install controller on worker nodes - # Default value: None - tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" diff --git a/tests/config/driverconfig/badDriver/v2.8.0/bad.yaml b/tests/config/driverconfig/badDriver/v2.11.0/bad.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.8.0/bad.yaml rename to tests/config/driverconfig/badDriver/v2.11.0/bad.yaml diff --git a/tests/config/driverconfig/badDriver/v2.8.0/controller.yaml b/tests/config/driverconfig/badDriver/v2.11.0/controller.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.8.0/controller.yaml rename to tests/config/driverconfig/badDriver/v2.11.0/controller.yaml diff --git a/tests/config/driverconfig/badDriver/v2.8.0/csidriver.yaml b/tests/config/driverconfig/badDriver/v2.11.0/csidriver.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.8.0/csidriver.yaml rename to tests/config/driverconfig/badDriver/v2.11.0/csidriver.yaml diff --git a/tests/config/driverconfig/badDriver/v2.8.0/driver-config-params.yaml b/tests/config/driverconfig/badDriver/v2.11.0/driver-config-params.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.8.0/driver-config-params.yaml rename to tests/config/driverconfig/badDriver/v2.11.0/driver-config-params.yaml diff --git a/tests/config/driverconfig/badDriver/v2.8.0/upgrade-path.yaml b/tests/config/driverconfig/badDriver/v2.11.0/upgrade-path.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.8.0/upgrade-path.yaml rename to tests/config/driverconfig/badDriver/v2.11.0/upgrade-path.yaml diff --git a/tests/config/driverconfig/powerscale/v2.8.0/bad.yaml b/tests/config/driverconfig/powerflex/v2.11.0/bad.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.8.0/bad.yaml rename to tests/config/driverconfig/powerflex/v2.11.0/bad.yaml diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml b/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml similarity index 94% rename from operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml rename to tests/config/driverconfig/powerflex/v2.11.0/controller.yaml index 4a006627e..155ec5e3f 100644 --- a/operatorconfig/driverconfig/powerflex/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml @@ -119,7 +119,7 @@ spec: serviceAccountName: -controller containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -132,7 +132,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -162,7 +162,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: csi-external-health-monitor-controller - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -179,7 +179,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -193,7 +193,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -206,11 +206,10 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-vxflexos:v2.8.0 + image: dellemc/csi-vxflexos:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-vxflexos.sh" ] args: - - "--leader-election" - "--array-config=/vxflexos-config/config" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" env: @@ -225,9 +224,11 @@ spec: - name: SSL_CERT_DIR value: /certs - name: X_CSI_HEALTH_MONITOR_ENABLED - value: false + value: "" - name: X_CSI_QUOTA_ENABLED value: + - name: X_CSI_POWERFLEX_EXTERNAL_ACCESS + value: volumeMounts: - name: socket-dir mountPath: /var/run/csi diff --git a/tests/config/driverconfig/powerflex/v2.11.0/csidriver.yaml b/tests/config/driverconfig/powerflex/v2.11.0/csidriver.yaml new file mode 100644 index 000000000..9fdb2dfa0 --- /dev/null +++ b/tests/config/driverconfig/powerflex/v2.11.0/csidriver.yaml @@ -0,0 +1,12 @@ +apiVersion: storage.k8s.io/v1 +kind: CSIDriver +metadata: + name: csi-vxflexos.dellemc.com +spec: + fsGroupPolicy: ReadWriteOnceWithFSType + attachRequired: true + podInfoOnMount: true + storageCapacity: false + volumeLifecycleModes: + - Persistent + - Ephemeral \ No newline at end of file diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/driver-config-params.yaml b/tests/config/driverconfig/powerflex/v2.11.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/powerflex/v2.8.0/driver-config-params.yaml rename to tests/config/driverconfig/powerflex/v2.11.0/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/powerflex/v2.8.0/node.yaml b/tests/config/driverconfig/powerflex/v2.11.0/node.yaml similarity index 95% rename from operatorconfig/driverconfig/powerflex/v2.8.0/node.yaml rename to tests/config/driverconfig/powerflex/v2.11.0/node.yaml index 0c85c6f75..4f781e1c1 100644 --- a/operatorconfig/driverconfig/powerflex/v2.8.0/node.yaml +++ b/tests/config/driverconfig/powerflex/v2.11.0/node.yaml @@ -82,7 +82,7 @@ spec: allowPrivilegeEscalation: true capabilities: add: ["SYS_ADMIN"] - image: dellemc/csi-vxflexos:v2.8.0 + image: dellemc/csi-vxflexos:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-vxflexos.sh" ] args: @@ -100,7 +100,7 @@ spec: - name: SSL_CERT_DIR value: /certs - name: X_CSI_HEALTH_MONITOR_ENABLED - value: false + value: "" - name: X_CSI_APPROVE_SDC_ENABLED value: - name: X_CSI_RENAME_SDC_ENABLED @@ -123,6 +123,8 @@ spec: - name: pods-path mountPath: /pods mountPropagation: "Bidirectional" + - name: noderoot + mountPath: /noderoot - name: dev mountPath: /dev - name: vxflexos-config @@ -133,7 +135,7 @@ spec: mountPath: /certs readOnly: true - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -155,7 +157,7 @@ spec: - name: sdc-monitor securityContext: privileged: true - image: dellemc/sdc:3.6.1 + image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent env: - name: HOST_PID @@ -177,13 +179,11 @@ spec: mountPath: /storage - name: udev-d mountPath: /rules.d - - name: host-opt-emc-path - mountPath: /host_opt_emc_path initContainers: - name: sdc securityContext: privileged: true - image: dellemc/sdc:3.6.1 + image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent env: - name: NODENAME @@ -210,8 +210,6 @@ spec: mountPath: /rules.d - name: scaleio-path-opt mountPath: /host_drv_cfg_path - - name: host-opt-emc-path - mountPath: /host_opt_emc_path volumes: - name: registration-dir hostPath: @@ -229,6 +227,10 @@ spec: hostPath: path: /pods type: Directory + - name: noderoot + hostPath: + path: / + type: Directory - name: dev hostPath: path: /dev @@ -252,10 +254,6 @@ spec: - name: vxflexos-config secret: secretName: -config - - name: host-opt-emc-path - hostPath: - path: /opt/emc - type: Directory - name: vxflexos-config-params configMap: name: -config-params diff --git a/tests/config/driverconfig/powerflex/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powerflex/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..3a5964d53 --- /dev/null +++ b/tests/config/driverconfig/powerflex/v2.11.0/upgrade-path.yaml @@ -0,0 +1 @@ +minUpgradePath: v2.10.1 \ No newline at end of file diff --git a/tests/config/driverconfig/powermax/v2.11.0/bad.yaml b/tests/config/driverconfig/powermax/v2.11.0/bad.yaml new file mode 100644 index 000000000..f90b8b7a7 --- /dev/null +++ b/tests/config/driverconfig/powermax/v2.11.0/bad.yaml @@ -0,0 +1,4 @@ +this snfoiasga + is + + 843*&(*(% invalid YAml diff --git a/operatorconfig/driverconfig/powermax/v2.8.0/controller.yaml b/tests/config/driverconfig/powermax/v2.11.0/controller.yaml similarity index 94% rename from operatorconfig/driverconfig/powermax/v2.8.0/controller.yaml rename to tests/config/driverconfig/powermax/v2.11.0/controller.yaml index 28f515804..cd5800763 100644 --- a/operatorconfig/driverconfig/powermax/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/powermax/v2.11.0/controller.yaml @@ -89,7 +89,7 @@ rules: verbs: ["get"] - apiGroups: ["apps"] resources: ["replicasets"] - verbs: ["get"] + verbs: ["get"] --- kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 @@ -137,7 +137,7 @@ spec: containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -151,7 +151,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -166,7 +166,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: external-health-monitor - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -183,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -214,7 +214,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -230,11 +230,9 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-powermax:v2.8.0 + image: dellemc/csi-powermax:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-powermax.sh" ] - args: - - "--leader-election" env: - name: X_CSI_POWERMAX_DRIVER_NAME value: csi-powermax.dellemc.com @@ -277,7 +275,11 @@ spec: - name: X_CSI_IG_MODIFY_HOSTNAME value: "" - name: X_CSI_POWERMAX_PROXY_SERVICE_NAME - value: "csipowermax-reverseproxy" + value: "powermax-reverseproxy" + - name: X_CSI_REPLICATION_CONTEXT_PREFIX + value: powermax/ + - name: X_CSI_REPLICATION_PREFIX + value: replication.storage.dell.com/ - name: X_CSI_UNISPHERE_TIMEOUT value: 5m - name: X_CSI_POWERMAX_CONFIG_PATH @@ -311,7 +313,7 @@ spec: mountPath: /certs readOnly: true - name: powermax-config-params - mountPath: -config-params + mountPath: /csi-powermax-config-params volumes: - name: socket-dir emptyDir: diff --git a/tests/config/driverconfig/powermax/v2.11.0/csidriver.yaml b/tests/config/driverconfig/powermax/v2.11.0/csidriver.yaml new file mode 100644 index 000000000..fcbf5531e --- /dev/null +++ b/tests/config/driverconfig/powermax/v2.11.0/csidriver.yaml @@ -0,0 +1,23 @@ +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +apiVersion: storage.k8s.io/v1 +kind: CSIDriver +metadata: + name: csi-powermax.dellemc.com +spec: + attachRequired: true + podInfoOnMount: true + fsGroupPolicy: ReadWriteOnceWithFSType + storageCapacity: false + volumeLifecycleModes: + - Persistent diff --git a/tests/config/driverconfig/powermax/v2.11.0/driver-config-params.yaml b/tests/config/driverconfig/powermax/v2.11.0/driver-config-params.yaml new file mode 100644 index 000000000..2755e8a33 --- /dev/null +++ b/tests/config/driverconfig/powermax/v2.11.0/driver-config-params.yaml @@ -0,0 +1,21 @@ +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +apiVersion: v1 +kind: ConfigMap +metadata: + name: -config-params + namespace: +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" diff --git a/tests/config/driverconfig/powermax/v2.11.0/node.yaml b/tests/config/driverconfig/powermax/v2.11.0/node.yaml new file mode 100644 index 000000000..366a94bd0 --- /dev/null +++ b/tests/config/driverconfig/powermax/v2.11.0/node.yaml @@ -0,0 +1,254 @@ +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +apiVersion: v1 +kind: ServiceAccount +metadata: + name: -node + namespace: +--- +kind: ClusterRole +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +rules: + - apiGroups: [""] + resources: ["persistentvolumes"] + verbs: ["create", "delete", "get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["persistentvolumeclaims"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: [""] + resources: ["events"] + verbs: ["get", "list", "watch", "create", "update", "patch"] + - apiGroups: [""] + resources: ["nodes"] + verbs: ["get", "list", "watch", "update", "patch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: ["storage.k8s.io"] + resources: ["storageclasses"] + verbs: ["get", "list", "watch"] + - apiGroups: ["storage.k8s.io"] + resources: ["volumeattachments"] + verbs: ["get", "list", "watch", "update"] + - apiGroups: [ "security.openshift.io" ] + resourceNames: [ "privileged" ] + resources: [ "securitycontextconstraints" ] + verbs: [ "use" ] +--- +kind: ClusterRoleBinding +apiVersion: rbac.authorization.k8s.io/v1 +metadata: + name: -node +subjects: + - kind: ServiceAccount + name: -node + namespace: +roleRef: + kind: ClusterRole + name: -node + apiGroup: rbac.authorization.k8s.io +--- +kind: DaemonSet +apiVersion: apps/v1 +metadata: + name: -node + namespace: +spec: + selector: + matchLabels: + app: -node + template: + metadata: + labels: + app: -node + spec: + serviceAccount: -node + #nodeSelector: + #tolerations: + hostNetwork: true + dnsPolicy: ClusterFirstWithHostNet + containers: + - name: driver + command: ["/csi-powermax.sh"] + securityContext: + privileged: true + capabilities: + add: ["SYS_ADMIN"] + allowPrivilegeEscalation: true + image: dellemc/csi-powermax:v2.10.0 + imagePullPolicy: IfNotPresent + env: + - name: X_CSI_POWERMAX_DRIVER_NAME + value: csi-powermax.dellemc.com + - name: CSI_ENDPOINT + value: unix:///plugins/powermax.emc.dell.com/csi_sock + - name: X_CSI_MANAGED_ARRAYS + value: "" + - name: X_CSI_POWERMAX_ENDPOINT + value: "" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "" + - name: X_CSI_MODE + value: node + - name: X_CSI_PRIVATE_MOUNT_DIR + value: "/plugins/powermax.emc.dell.com/disks" + - name: X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION + value: true + - name: X_CSI_POWERMAX_USER + valueFrom: + secretKeyRef: + name: powermax-creds + key: username + - name: X_CSI_POWERMAX_PASSWORD + valueFrom: + secretKeyRef: + name: powermax-creds + key: password + - name: X_CSI_POWERMAX_NODENAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + - name: X_CSI_POWERMAX_ISCSI_ENABLE_CHAP + value: "" + - name: X_CSI_POWERMAX_PROXY_SERVICE_NAME + value: "powermax-reverseproxy" + - name: X_CSI_ISCSI_CHROOT + value: noderoot + - name: X_CSI_GRPC_MAX_THREADS + value: "50" + - name: X_CSI_TRANSPORT_PROTOCOL + value: "" + - name: SSL_CERT_DIR + value: /certs + - name: X_CSI_POWERMAX_CONFIG_PATH + value: /powermax-config-params/driver-config-params.yaml + - name: X_CSI_POWERMAX_TOPOLOGY_CONFIG_PATH + value: /node-topology-config/topologyConfig.yaml + - name: X_CSI_IG_NODENAME_TEMPLATE + value: "" + - name: X_CSI_IG_MODIFY_HOSTNAME + value: "" + - name: X_CSI_POWERMAX_PORTGROUPS + value: "" + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "" + - name: X_CSI_TOPOLOGY_CONTROL_ENABLED + value: "" + - name: X_CSI_VSPHERE_ENABLED + value: "" + - name: X_CSI_VSPHERE_PORTGROUP + value: "" + - name: X_CSI_VCENTER_HOST + value: "" + - name: X_CSI_VCENTER_USERNAME + valueFrom: + secretKeyRef: + key: username + name: vcenter-creds + optional: true + - name: X_CSI_VCENTER_PWD + valueFrom: + secretKeyRef: + key: password + name: vcenter-creds + optional: true + volumeMounts: + - name: driver-path + mountPath: /plugins/powermax.emc.dell.com + - name: volumedevices-path + mountPath: /plugins/kubernetes.io/csi/volumeDevices + - name: pods-path + mountPath: /pods + mountPropagation: "Bidirectional" + - name: dev + mountPath: /dev + - name: sys + mountPath: /sys + - name: noderoot + mountPath: /noderoot + - name: dbus-socket + mountPath: /run/dbus/system_bus_socket + - name: certs + mountPath: /certs + readOnly: true + - name: powermax-config-params + mountPath: /powermax-config-params + - name: node-topology-config + mountPath: /node-topology-config + - name: registrar + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + imagePullPolicy: IfNotPresent + args: + - "--v=5" + - "--csi-address=$(ADDRESS)" + - --kubelet-registration-path=/plugins/powermax.emc.dell.com/csi_sock + env: + - name: ADDRESS + value: /csi/csi_sock + - name: KUBE_NODE_NAME + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: spec.nodeName + volumeMounts: + - name: registration-dir + mountPath: /registration + - name: driver-path + mountPath: /csi + volumes: + - name: registration-dir + hostPath: + path: /plugins_registry/ + type: DirectoryOrCreate + - name: driver-path + hostPath: + path: /plugins/powermax.emc.dell.com + type: DirectoryOrCreate + - name: volumedevices-path + hostPath: + path: /plugins/kubernetes.io/csi/volumeDevices + type: DirectoryOrCreate + - name: pods-path + hostPath: + path: /pods + type: Directory + - name: dev + hostPath: + path: /dev + type: Directory + - name: sys + hostPath: + path: /sys + type: Directory + - name: noderoot + hostPath: + path: / + type: Directory + - name: dbus-socket + hostPath: + path: /run/dbus/system_bus_socket + type: Socket + - name: certs + secret: + secretName: -certs + optional: true + - name: powermax-config-params + configMap: + name: -config-params + - name: node-topology-config + configMap: + name: node-topology-config + optional: true diff --git a/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..3a5964d53 --- /dev/null +++ b/tests/config/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -0,0 +1 @@ +minUpgradePath: v2.10.1 \ No newline at end of file diff --git a/tests/config/driverconfig/powerscale/v2.11.0/bad.yaml b/tests/config/driverconfig/powerscale/v2.11.0/bad.yaml new file mode 100644 index 000000000..f90b8b7a7 --- /dev/null +++ b/tests/config/driverconfig/powerscale/v2.11.0/bad.yaml @@ -0,0 +1,4 @@ +this snfoiasga + is + + 843*&(*(% invalid YAml diff --git a/tests/config/driverconfig/powerscale/v2.8.0/controller.yaml b/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml similarity index 96% rename from tests/config/driverconfig/powerscale/v2.8.0/controller.yaml rename to tests/config/driverconfig/powerscale/v2.11.0/controller.yaml index 53acb97ec..44ff5ed14 100644 --- a/tests/config/driverconfig/powerscale/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml @@ -128,7 +128,7 @@ spec: containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.7.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -145,7 +145,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.2.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -162,7 +162,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: external-health-monitor - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.8.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -182,7 +182,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.4.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -215,7 +215,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -233,7 +233,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-isilon:v2.8.0 + image: dellemc/csi-isilon:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-isilon" ] args: diff --git a/tests/config/driverconfig/powerscale/v2.8.0/csidriver.yaml b/tests/config/driverconfig/powerscale/v2.11.0/csidriver.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.8.0/csidriver.yaml rename to tests/config/driverconfig/powerscale/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/powerscale/v2.8.0/driver-config-params.yaml b/tests/config/driverconfig/powerscale/v2.11.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/powerscale/v2.8.0/driver-config-params.yaml rename to tests/config/driverconfig/powerscale/v2.11.0/driver-config-params.yaml diff --git a/tests/config/driverconfig/powerscale/v2.8.0/node.yaml b/tests/config/driverconfig/powerscale/v2.11.0/node.yaml similarity index 99% rename from tests/config/driverconfig/powerscale/v2.8.0/node.yaml rename to tests/config/driverconfig/powerscale/v2.11.0/node.yaml index c00c882ef..acb7e4692 100644 --- a/tests/config/driverconfig/powerscale/v2.8.0/node.yaml +++ b/tests/config/driverconfig/powerscale/v2.11.0/node.yaml @@ -77,7 +77,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-isilon:v2.8.0 + image: dellemc/csi-isilon:v2.10.0 imagePullPolicy: IfNotPresent env: - name: CSI_ENDPOINT @@ -140,7 +140,7 @@ spec: - name: csi-isilon-config-params mountPath: /csi-isilon-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.6.3 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..3a5964d53 --- /dev/null +++ b/tests/config/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -0,0 +1 @@ +minUpgradePath: v2.10.1 \ No newline at end of file diff --git a/tests/config/driverconfig/powerscale/v2.8.0/driver-config-params.yaml b/tests/config/driverconfig/powerscale/v2.8.0/driver-config-params.yaml deleted file mode 100644 index 506503099..000000000 --- a/tests/config/driverconfig/powerscale/v2.8.0/driver-config-params.yaml +++ /dev/null @@ -1,8 +0,0 @@ -apiVersion: v1 -kind: ConfigMap -metadata: - name: -config-params - namespace: -data: - driver-config-params.yaml: | - CSI_LOG_LEVEL: debug diff --git a/tests/config/driverconfig/powerscale/v2.8.0/upgrade-path.yaml b/tests/config/driverconfig/powerscale/v2.8.0/upgrade-path.yaml deleted file mode 100644 index fab8efca9..000000000 --- a/tests/config/driverconfig/powerscale/v2.8.0/upgrade-path.yaml +++ /dev/null @@ -1 +0,0 @@ -minUpgradePath: v2.7.0 diff --git a/tests/config/driverconfig/powerstore/v2.11.0/bad.yaml b/tests/config/driverconfig/powerstore/v2.11.0/bad.yaml new file mode 100644 index 000000000..a85d0f248 --- /dev/null +++ b/tests/config/driverconfig/powerstore/v2.11.0/bad.yaml @@ -0,0 +1,19 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +this snfoiasga + is + + 843*&(*(% invalid YAml \ No newline at end of file diff --git a/tests/config/driverconfig/powerstore/v2.11.0/config.json b/tests/config/driverconfig/powerstore/v2.11.0/config.json new file mode 100644 index 000000000..b90989ebe --- /dev/null +++ b/tests/config/driverconfig/powerstore/v2.11.0/config.json @@ -0,0 +1,12 @@ +[ + { + "username": "admin", + "password": "password", + "globalID": "unique" , + "blockProtocol": "auto", + "endpoint": "https://10.0.0.1/api/rest", + "skipCertificateValidation": true, + "nasName": "nas-server" , + "nfsAcls": "0777" + } +] \ No newline at end of file diff --git a/operatorconfig/driverconfig/powerstore/v2.8.0/controller.yaml b/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml similarity index 96% rename from operatorconfig/driverconfig/powerstore/v2.8.0/controller.yaml rename to tests/config/driverconfig/powerstore/v2.11.0/controller.yaml index 5967802fe..4325897fc 100644 --- a/operatorconfig/driverconfig/powerstore/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml @@ -131,7 +131,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -147,7 +147,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -160,7 +160,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -171,7 +171,7 @@ spec: - "--default-fstype=ext4" - "--extra-create-metadata" - "--feature-gates=Topology=true" - - "--enable-capacity=true" + - "--enable-capacity=false" - "--capacity-ownerref-level=2" - "--capacity-poll-interval=5m" env: @@ -189,7 +189,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -203,7 +203,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: external-health-monitor - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -223,7 +223,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-powerstore:v2.8.0 + image: dellemc/csi-powerstore:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-powerstore" ] args: diff --git a/tests/config/driverconfig/powerstore/v2.11.0/csidriver.yaml b/tests/config/driverconfig/powerstore/v2.11.0/csidriver.yaml new file mode 100644 index 000000000..1d6b34780 --- /dev/null +++ b/tests/config/driverconfig/powerstore/v2.11.0/csidriver.yaml @@ -0,0 +1,27 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +apiVersion: storage.k8s.io/v1 +kind: CSIDriver +metadata: + name: csi-powerstore.dellemc.com +spec: + storageCapacity: false + podInfoOnMount: true + fsGroupPolicy: ReadWriteOnceWithFSType + volumeLifecycleModes: + - Persistent + - Ephemeral \ No newline at end of file diff --git a/tests/config/driverconfig/powerstore/v2.11.0/driver-config-params.yaml b/tests/config/driverconfig/powerstore/v2.11.0/driver-config-params.yaml new file mode 100644 index 000000000..94ce0ee14 --- /dev/null +++ b/tests/config/driverconfig/powerstore/v2.11.0/driver-config-params.yaml @@ -0,0 +1,25 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# + +apiVersion: v1 +kind: ConfigMap +metadata: + name: -config-params + namespace: +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/operatorconfig/driverconfig/powerstore/v2.8.0/node.yaml b/tests/config/driverconfig/powerstore/v2.11.0/node.yaml similarity index 98% rename from operatorconfig/driverconfig/powerstore/v2.8.0/node.yaml rename to tests/config/driverconfig/powerstore/v2.11.0/node.yaml index a992b3d51..9074f5732 100644 --- a/operatorconfig/driverconfig/powerstore/v2.8.0/node.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/node.yaml @@ -91,7 +91,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-powerstore:v2.8.0 + image: dellemc/csi-powerstore:v2.10.0 imagePullPolicy: IfNotPresent command: [ "/csi-powerstore" ] args: @@ -161,7 +161,7 @@ spec: - name: powerstore-config-params mountPath: /powerstore-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -241,4 +241,4 @@ spec: - name: var-run hostPath: path: /var/run - type: Directory + type: Directory \ No newline at end of file diff --git a/operatorconfig/driverconfig/powerstore/v2.8.0/upgrade-path.yaml b/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml similarity index 96% rename from operatorconfig/driverconfig/powerstore/v2.8.0/upgrade-path.yaml rename to tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml index 360a96012..526e296a0 100644 --- a/operatorconfig/driverconfig/powerstore/v2.8.0/upgrade-path.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -13,4 +13,4 @@ # limitations under the License. # # -minUpgradePath: v2.7.0 \ No newline at end of file +minUpgradePath: v2.10.1 \ No newline at end of file diff --git a/tests/config/driverconfig/unity/v2.11.0/bad.yaml b/tests/config/driverconfig/unity/v2.11.0/bad.yaml new file mode 100644 index 000000000..89aaa9556 --- /dev/null +++ b/tests/config/driverconfig/unity/v2.11.0/bad.yaml @@ -0,0 +1,19 @@ +# +# +# Copyright © 2023 Dell Inc. or its subsidiaries. All Rights Reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# http://www.apache.org/licenses/LICENSE-2.0 +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# +this snfoiasga + is + + 843*&(*(% invalid YAml diff --git a/tests/config/driverconfig/unity/v2.11.0/config.json b/tests/config/driverconfig/unity/v2.11.0/config.json new file mode 100644 index 000000000..77550649a --- /dev/null +++ b/tests/config/driverconfig/unity/v2.11.0/config.json @@ -0,0 +1,12 @@ +[ + { + "arrayId": "AB1234567890" , + "username": "admin", + "password": "password", + "endpoint": "https://10.0.0.1/", + "skipCertificateValidation": true, + "isDefault": true + } +] + + diff --git a/operatorconfig/driverconfig/unity/v2.8.0/controller.yaml b/tests/config/driverconfig/unity/v2.11.0/controller.yaml similarity index 95% rename from operatorconfig/driverconfig/unity/v2.8.0/controller.yaml rename to tests/config/driverconfig/unity/v2.11.0/controller.yaml index 30c6b6f30..15a427036 100644 --- a/operatorconfig/driverconfig/unity/v2.8.0/controller.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/controller.yaml @@ -120,7 +120,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.3.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -133,7 +133,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v3.5.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -165,7 +165,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v6.2.2 + image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -181,7 +181,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.8.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -194,7 +194,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: external-health-monitor - image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.9.0 + image: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 imagePullPolicy: IfNotPresent args: - "--v=5" @@ -211,12 +211,11 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-unity:v2.8.0 + image: dellemc/csi-unity:v2.9.1 args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" - "--driver-secret=/unity-secret/config" - - "--leader-election" imagePullPolicy: IfNotPresent env: - name: CSI_ENDPOINT diff --git a/operatorconfig/driverconfig/unity/v2.8.0/csidriver.yaml b/tests/config/driverconfig/unity/v2.11.0/csidriver.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.8.0/csidriver.yaml rename to tests/config/driverconfig/unity/v2.11.0/csidriver.yaml diff --git a/operatorconfig/driverconfig/unity/v2.8.0/driver-config-params.yaml b/tests/config/driverconfig/unity/v2.11.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/unity/v2.8.0/driver-config-params.yaml rename to tests/config/driverconfig/unity/v2.11.0/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/unity/v2.8.0/node.yaml b/tests/config/driverconfig/unity/v2.11.0/node.yaml similarity index 99% rename from operatorconfig/driverconfig/unity/v2.8.0/node.yaml rename to tests/config/driverconfig/unity/v2.11.0/node.yaml index 963ea1433..7de3cced1 100644 --- a/operatorconfig/driverconfig/unity/v2.8.0/node.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/node.yaml @@ -75,7 +75,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-unity:v2.8.0 + image: dellemc/csi-unity:nightly imagePullPolicy: IfNotPresent args: - "--driver-name=csi-unity.dellemc.com" diff --git a/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml b/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml new file mode 100644 index 000000000..3a5964d53 --- /dev/null +++ b/tests/config/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -0,0 +1 @@ +minUpgradePath: v2.10.1 \ No newline at end of file diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml index 4e13a7295..45eef90f7 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml @@ -16,7 +16,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml index 89535963f..4cdbaa21c 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml @@ -16,7 +16,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml b/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml index 3ddb26935..6c635495b 100644 --- a/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml @@ -16,7 +16,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml index 8099dbaa8..95b04c28c 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex.yaml @@ -16,7 +16,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -42,29 +42,26 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false 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" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] controller: envs: @@ -76,7 +73,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -101,7 +97,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -118,7 +113,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -126,20 +120,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -164,15 +155,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -180,17 +169,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -209,7 +196,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -222,7 +208,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false @@ -279,7 +264,6 @@ spec: # Default value: "otel-collector:55680" - name: "COLLECTOR_ADDRESS" value: "otel-collector:55680" - # Replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -291,58 +275,54 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerflex" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerflex" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 - name: resiliency # enabled: Enable/Disable Resiliency feature # Allowed values: diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml index 9330df402..4fdbd9a58 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: true @@ -37,25 +37,21 @@ spec: value: "1" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -66,7 +62,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -83,15 +78,14 @@ spec: # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # - key: "node-role.kubernetes.io/master" - # operator: "Exists" - # effect: "NoSchedule" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -108,7 +102,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "true" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -116,20 +109,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "true" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "s" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "0" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -146,15 +136,14 @@ spec: # Leave as blank to install node driver only on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # - key: "node-role.kubernetes.io/master" - # operator: "Exists" - # effect: "NoSchedule" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: Always @@ -162,7 +151,6 @@ spec: envs: - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -170,17 +158,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -199,7 +185,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -212,7 +197,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml index 9526609c6..1f5990a38 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "None" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -37,25 +37,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -66,7 +62,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -74,24 +69,22 @@ spec: # Examples: # node-role.kubernetes.io/control-plane: "" nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # node-role.kubernetes.io/master: "" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint node-role.kubernetes.io/control-plane: "" - # "controller.tolerations" defines tolerations that would be applied to controller deployment # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # - key: "node-role.kubernetes.io/master" - # operator: "Exists" - # effect: "NoSchedule" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -108,7 +101,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -116,20 +108,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "1" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -154,15 +143,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -170,17 +157,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -199,7 +184,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -212,7 +196,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml index 887f9a2d0..e9dd0a353 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -37,25 +37,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -66,7 +62,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -91,7 +86,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -101,7 +95,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "true" - # X_CSI_APPROVE_SDC_ENABLED: Enables/Disable SDC approval # Allowed values: # true: enable SDC approval @@ -109,7 +102,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -117,20 +109,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "1" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -138,32 +127,29 @@ spec: # Examples: # node-role.kubernetes.io/control-plane: "" nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # node-role.kubernetes.io/master: "" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # node-role.kubernetes.io/master: "" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint node-role.kubernetes.io/control-plane: "" - # "node.tolerations" defines tolerations that would be applied to node daemonset # Leave as blank to install node driver only on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint - # - key: "node-role.kubernetes.io/master" - # operator: "Exists" - # effect: "NoSchedule" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/master taint + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -171,17 +157,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -200,7 +184,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -213,7 +196,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml index cc1f81e4a..9c9d55128 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -37,25 +37,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -66,7 +62,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -91,7 +86,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -108,7 +102,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -116,20 +109,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "1" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -154,15 +144,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: Never name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -170,17 +158,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -199,7 +185,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -212,7 +197,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml index 9572e2ba6..5cb53ebdb 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,25 +35,21 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -99,7 +93,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -124,14 +117,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -139,13 +131,12 @@ spec: enabled: true configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml index d409271e8..dcc11298a 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -37,25 +37,21 @@ spec: value: "0" - name: X_CSI_QUOTA_ENABLED value: "false" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: true image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: true args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -66,7 +62,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "true" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -91,7 +86,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -108,7 +102,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -116,20 +109,17 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # X_CSI_MAX_VOLUMES_PER_NODE: Defines the maximum PowerFlex volumes that can be created per node # Allowed values: Any value greater than or equal to 0 # Default value: "0" - name: X_CSI_MAX_VOLUMES_PER_NODE value: "1" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -154,15 +144,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -170,17 +158,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -199,7 +185,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -212,7 +197,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml index dfe93a44c..947050591 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor @@ -47,13 +45,11 @@ spec: value: "1" - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -99,7 +93,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -124,15 +117,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -160,7 +151,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -181,7 +171,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -189,7 +178,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: true enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml index 6d33eed30..efa135eed 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor @@ -47,13 +45,11 @@ spec: value: "1" - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -99,7 +93,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -124,32 +117,29 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: - # Authorization: enable csm-authorization for RBAC + # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization enabled: true configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -176,7 +166,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -197,15 +186,13 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager - # enabled: Enable/Disable cert-manager - # Allowed values: - # true: enable deployment of cert-manager - # false: disable deployment of cert-manager only if it's already deployed - # Default value: true + # enabled: Enable/Disable cert-manager + # Allowed values: + # true: enable deployment of cert-manager + # false: disable deployment of cert-manager only if it's already deployed + # Default value: true enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml index f798e7370..f8d1549d7 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor @@ -47,13 +45,11 @@ spec: value: "1" - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -99,7 +93,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -124,15 +117,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -160,7 +151,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -181,7 +171,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -189,7 +178,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: true enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml index 648e36e25..e0f2bc973 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,8 +35,6 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor @@ -47,13 +45,11 @@ spec: value: "1" - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value - # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -99,7 +93,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -124,15 +117,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # observability: allows to configure observability - name: observability @@ -160,7 +151,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -181,7 +171,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -189,7 +178,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: true enabled: true - - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml index f7009396c..8a724f205 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -35,25 +35,21 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -89,7 +84,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -106,7 +100,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -114,14 +107,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -146,15 +137,13 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: # Replication: allows to configure replication # Replication CRDs must be installed before installing driver @@ -167,55 +156,52 @@ spec: enabled: true 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerflex" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerflex" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 + image: dellemc/dell-replication-init:v1.0.0 diff --git a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml index f382043a7..8209fb605 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml @@ -27,7 +27,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -51,25 +51,21 @@ spec: value: "/var/lib/kubelet" - name: "CERT_SECRET_COUNT" value: "0" - - sideCars: - # sdc-monitor is disabled by default, due to high CPU usage + # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false image: dellemc/sdc:4.5.1 envs: - - name: HOST_PID - value: "1" - - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - - # health monitor is disabled by default, refer to driver documentation before enabling it - # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + - name: HOST_PID + value: "1" + - name: MDM + value: "10.x.x.x,10.x.x.x" #provide MDM value + # health monitor is disabled by default, refer to driver documentation before enabling it + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] - controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -80,7 +76,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - #"controller.nodeSelector" defines what nodes would be selected for pods of controller deployment # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -99,7 +94,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin - volume usage @@ -116,7 +110,6 @@ spec: # Default value: false - name: X_CSI_APPROVE_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_ENABLED: Enable/Disable rename of SDC # Allowed values: # true: enable renaming @@ -124,14 +117,12 @@ spec: # Default value: false - name: X_CSI_RENAME_SDC_ENABLED value: "false" - # X_CSI_RENAME_SDC_PREFIX: defines a string for prefix of the SDC name. # "prefix" + "worker_node_hostname" should not exceed 31 chars. # Default value: none # Examples: "rhel-sdc", "sdc-test" - name: X_CSI_RENAME_SDC_PREFIX value: "" - # "node.nodeSelector" defines what nodes would be selected for pods of node daemonset # Leave as blank to use all nodes # Allowed values: map of key-value pairs @@ -173,15 +164,13 @@ spec: # - key: "isilon.podmon.storage.dell.com" # operator: "Exists" # effect: "NoSchedule" - initContainers: - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" #provide MDM value - + value: "10.x.x.x,10.x.x.x" #provide MDM value modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -220,7 +209,6 @@ spec: - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - "--ignoreVolumelessPods=false" - --- apiVersion: v1 kind: ConfigMap @@ -235,3 +223,6 @@ data: PODMON_CONTROLLER_LOG_FORMAT: "TEXT" PODMON_NODE_LOG_LEVEL: "debug" PODMON_NODE_LOG_FORMAT: "TEXT" +spec: + driver: + configVersion: v2.11.0 diff --git a/tests/e2e/testfiles/storage_csm_powermax.yaml b/tests/e2e/testfiles/storage_csm_powermax.yaml index 4793933e4..cb305b9f6 100644 --- a/tests/e2e/testfiles/storage_csm_powermax.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerMax v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -44,8 +43,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerMax driver v2.10.1 - image: dellemc/csi-powermax:v2.10.1 + image: dellemc/csi-powermax:v2.11.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -172,8 +170,7 @@ spec: # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false - args: [ "--monitor-interval=60s" ] - + args: ["--monitor-interval=60s"] modules: # CSI Powermax Reverseproxy is a mandatory module for Powermax - name: csireverseproxy diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml index 551f5b47b..f243eb54b 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml @@ -31,8 +31,7 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI PowerMax v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -44,8 +43,7 @@ spec: forceUpdate: false forceRemoveDriver: true common: - # Image for CSI PowerMax driver v2.10.1 - image: dellemc/csi-powermax:v2.10.1 + image: dellemc/csi-powermax:v2.11.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -172,8 +170,7 @@ spec: # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false - args: [ "--monitor-interval=60s" ] - + args: ["--monitor-interval=60s"] modules: # CSI Powermax Reverseproxy is a mandatory module for Powermax - name: csireverseproxy @@ -224,7 +221,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -245,7 +241,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: cert-manager # enabled: Enable/Disable cert-manager # Allowed values: @@ -253,7 +248,6 @@ spec: # false: disable deployment of cert-manager only if it's already deployed # Default value: false enabled: true - - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerscale.yaml b/tests/e2e/testfiles/storage_csm_powerscale.yaml index 6a37f6eb8..3c013c0e4 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 1 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_ISI_AUTH_TYPE: Specify the authentication method to be used. # Allowed values: # 0: basic authentication @@ -79,7 +73,6 @@ spec: # Default value: 0 - name: X_CSI_ISI_AUTH_TYPE value: "0" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -89,77 +82,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -177,42 +160,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -239,7 +217,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -247,7 +224,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -255,17 +231,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -277,59 +251,55 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -348,7 +318,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -361,7 +330,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml index 2dbaa8100..d7ef64e67 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "File" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: csm-creds # currently fails with something about nodes taints etc replicas: 3 @@ -30,14 +30,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -48,7 +46,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/e2etest" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -56,7 +53,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "true" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -64,7 +60,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -75,7 +70,6 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION #value: "false" value: "true" - # X_CSI_ISI_AUTH_TYPE: Specify the authentication method to be used. # Allowed values: # 0: basic authentication @@ -83,7 +77,6 @@ spec: # Default value: 0 - name: X_CSI_ISI_AUTH_TYPE value: "1" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -93,81 +86,71 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR #value: "/root/alt-kubelet/kubelet" value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "3" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "error" #value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "false" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # If this test fails, go to the OneFS Storage Administration dashboard and navigate to Access -> Access zones - # to check if the "E2eTestZone" exists. If it doesn't, create it with base directory /ifs and whatever groupnet is offered. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "E2eTestZone" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "true" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "256" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "false" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # If this test fails, go to the OneFS Storage Administration dashboard and navigate to Access -> Access zones + # to check if the "E2eTestZone" exists. If it doesn't, create it with base directory /ifs and whatever groupnet is offered. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "E2eTestZone" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "true" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "256" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -181,46 +164,41 @@ spec: # tolerations: Define tolerations for the controller deployment, if required. # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "20" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "256" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "20" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "256" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -234,20 +212,19 @@ spec: # tolerations: Define tolerations for the node daemonset, if required. # Default value: None tolerations: - - key: "node.kubernetes.io/memory-pressure" - operator: "Exists" - effect: "NoExecute" - - key: "node.kubernetes.io/disk-pressure" - operator: "Exists" - effect: "NoExecute" - - key: "node.kubernetes.io/network-unavailable" - operator: "Exists" - effect: "NoExecute" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + - key: "node.kubernetes.io/memory-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/disk-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/network-unavailable" + operator: "Exists" + effect: "NoExecute" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" sideCars: - name: provisioner args: ["--volume-name-prefix=pscale"] @@ -255,7 +232,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -263,17 +239,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -285,59 +259,55 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -356,7 +326,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -369,7 +338,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml index d38093a78..3afa80cb8 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "None" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: csm-creds replicas: 1 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "2" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -81,77 +75,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "warn" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "757" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "757" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -159,52 +143,46 @@ spec: # Allowed values: map of key-value pairs # Default value: None nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint node-role.kubernetes.io/control-plane: "" - # tolerations: Define tolerations for the controller deployment, if required. # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -231,7 +209,6 @@ spec: #- key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -239,7 +216,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -247,17 +223,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -269,59 +243,55 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -340,7 +310,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -353,7 +322,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml index c61895363..a26a6502c 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: csm-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -81,77 +75,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "info" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -169,42 +153,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -212,26 +191,24 @@ spec: # Allowed values: map of key-value pairs # Default value: None nodeSelector: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint node-role.kubernetes.io/control-plane: "" - # tolerations: Define tolerations for the node daemonset, if required. # Default value: None tolerations: - - key: "node.kubernetes.io/memory-pressure" - operator: "Exists" - effect: "NoExecute" - - key: "node.kubernetes.io/disk-pressure" - operator: "Exists" - effect: "NoExecute" - - key: "node.kubernetes.io/network-unavailable" - operator: "Exists" - effect: "NoExecute" - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - + - key: "node.kubernetes.io/memory-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/disk-pressure" + operator: "Exists" + effect: "NoExecute" + - key: "node.kubernetes.io/network-unavailable" + operator: "Exists" + effect: "NoExecute" + # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint + - key: "node-role.kubernetes.io/control-plane" + operator: "Exists" + effect: "NoSchedule" sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -239,7 +216,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -247,17 +223,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -269,59 +243,55 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -340,7 +310,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -353,7 +322,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml index 9a81addea..9cf78ee35 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds-auth replicas: 1 dnsPolicy: ClusterFirstWithHostNet @@ -28,14 +28,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -44,7 +42,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -52,7 +49,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -60,7 +56,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -70,7 +65,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -80,77 +74,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -168,42 +152,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -230,7 +209,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -238,7 +216,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -246,13 +223,12 @@ spec: enabled: true configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" diff --git a/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml index 4a58bcbcb..fb32b5f84 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: csm-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -81,77 +75,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "true" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "true" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -169,42 +153,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "true" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "true" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -231,7 +210,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -239,7 +217,6 @@ spec: - name: external-health-monitor enabled: true args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -247,17 +224,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "csm-authorization.com" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:v1.10.1 + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "csm-authorization.com" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -269,59 +244,55 @@ spec: enabled: false 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -340,7 +311,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -353,7 +323,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml index 7ce11ffc4..70907c256 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml index 40e644436..be37f184c 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds-auth replicas: 2 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -81,61 +75,53 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -160,36 +146,32 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -223,7 +205,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -231,7 +212,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -239,16 +219,15 @@ spec: enabled: true configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -275,7 +254,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: true @@ -296,7 +274,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - # enabled: Enable/Disable cert-manager # Allowed values: # true: enable deployment of cert-manager @@ -304,7 +281,6 @@ spec: # Default value: true - name: cert-manager enabled: true - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: true diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml index f24d35e9e..2193d0276 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet diff --git a/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml b/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml index 5e376667f..3e352b4f8 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet @@ -29,14 +29,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -45,7 +43,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -53,7 +50,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -61,7 +57,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -71,7 +66,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -81,77 +75,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -169,42 +153,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -231,7 +210,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -239,7 +217,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: # Authorization: enable csm-authorization for RBAC - name: authorization @@ -247,17 +224,15 @@ spec: enabled: false configVersion: v1.10.1 components: - - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:nightly - envs: - # proxyHost: hostname of the csm-authorization server - - name: "PROXY_HOST" - value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - - # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server - - name: "SKIP_CERTIFICATE_VALIDATION" - value: "true" - + - name: karavi-authorization-proxy + image: dellemc/csm-authorization-sidecar:nightly + envs: + # proxyHost: hostname of the csm-authorization server + - name: "PROXY_HOST" + value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" + # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + - name: "SKIP_CERTIFICATE_VALIDATION" + value: "true" # replication: allows to configure replication # Replication CRDs must be installed before installing driver - name: replication @@ -269,59 +244,55 @@ spec: enabled: true 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.1 - envs: - # replicationPrefix: prefix to prepend to storage classes parameters + - name: dell-csi-replicator + # image: Image to use for dell-csi-replicator. This shouldn't be changed # Allowed values: string - # Default value: replication.storage.dell.com - - name: "X_CSI_REPLICATION_PREFIX" - value: "replication.storage.dell.com" - # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Default value: None + image: dellemc/dell-csi-replicator:v1.8.1 + envs: + # replicationPrefix: prefix to prepend to storage classes parameters + # Allowed values: string + # Default value: replication.storage.dell.com + - name: "X_CSI_REPLICATION_PREFIX" + value: "replication.storage.dell.com" + # replicationContextPrefix: prefix to use for naming of resources created by replication feature + # Allowed values: string + # Default value: powerstore + - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" + value: "powerscale" + - name: dell-replication-controller-manager + # image: Defines controller image. This shouldn't be changed # Allowed values: string - # Default value: powerstore - - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" - value: "powerscale" - - - name: dell-replication-controller-manager - # image: Defines controller image. This shouldn't be changed - # Allowed values: string - 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 + 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 + # Allowed values: string + - name: "TARGET_CLUSTERS_IDS" + value: "self" + # Replication log level + # Allowed values: "error", "warn"/"warning", "info", "debug" + # Default value: "debug" + - name: "REPLICATION_CTRL_LOG_LEVEL" + value: "debug" + # replicas: Defines number of controller replicas + # Allowed values: int + # Default value: 1 + - name: "REPLICATION_CTRL_REPLICAS" + value: "1" + # retryIntervalMin: Initial retry interval of failed reconcile request. + # It doubles with each failure, upto retry-interval-max + # Allowed values: time + - name: "RETRY_INTERVAL_MIN" + value: "1s" + # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request + # Allowed values: time + - 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 - - name: "TARGET_CLUSTERS_IDS" - value: "self" - # Replication log level - # Allowed values: "error", "warn"/"warning", "info", "debug" - # Default value: "debug" - - name: "REPLICATION_CTRL_LOG_LEVEL" - value: "debug" - - # replicas: Defines number of controller replicas - # Allowed values: int - # Default value: 1 - - name: "REPLICATION_CTRL_REPLICAS" - value: "1" - # retryIntervalMin: Initial retry interval of failed reconcile request. - # It doubles with each failure, upto retry-interval-max - # Allowed values: time - - name: "RETRY_INTERVAL_MIN" - value: "1s" - # RETRY_INTERVAL_MAX: Maximum retry interval of failed reconcile request - # Allowed values: time - - 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.0 - + image: dellemc/dell-replication-init:v1.0.0 # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability @@ -340,7 +311,6 @@ spec: # Default value: "INFO" - name: "TOPOLOGY_LOG_LEVEL" value: "INFO" - - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector enabled: false @@ -353,7 +323,6 @@ spec: # Default value: "nginxinc/nginx-unprivileged:1.20" - name: "NGINX_PROXY_IMAGE" value: "nginxinc/nginx-unprivileged:1.20" - - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics enabled: false diff --git a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml index 7b8d46033..5a2cef69a 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml @@ -26,7 +26,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: isilon-creds replicas: 2 dnsPolicy: ClusterFirstWithHostNet @@ -44,14 +44,12 @@ spec: # Default value: 0 - name: X_CSI_VERBOSE value: "1" - # X_CSI_ISI_PORT: Specify the HTTPs port number of the PowerScale OneFS API server # This value acts as a default value for endpointPort, if not specified for a cluster config in secret # Allowed value: valid port number # Default value: 8080 - name: X_CSI_ISI_PORT value: "8080" - # X_CSI_ISI_PATH: The base path for the volumes to be created on PowerScale cluster. # This value acts as a default value for isiPath, if not specified for a cluster config in secret # Ensure that this path exists on PowerScale cluster. @@ -60,7 +58,6 @@ spec: # Examples: /ifs/data/csi, /ifs/engineering - name: X_CSI_ISI_PATH value: "/ifs/data/csi" - # X_CSI_ISI_NO_PROBE_ON_START: Indicates whether the controller/node should probe all the PowerScale clusters during driver initialization # Allowed values: # true : do not probe all PowerScale clusters during driver initialization @@ -68,7 +65,6 @@ spec: # Default value: false - name: X_CSI_ISI_NO_PROBE_ON_START value: "false" - # X_CSI_ISI_AUTOPROBE: automatically probe the PowerScale cluster if not done already during CSI calls. # Allowed values: # true : enable auto probe. @@ -76,7 +72,6 @@ spec: # Default value: false - name: X_CSI_ISI_AUTOPROBE value: "true" - # X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION: Specify whether the PowerScale OneFS API server's certificate chain and host name should be verified. # Formerly this attribute was named as "X_CSI_ISI_INSECURE" # This value acts as a default value for skipCertificateValidation, if not specified for a cluster config in secret @@ -86,7 +81,6 @@ spec: # Default value: true - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" - # X_CSI_CUSTOM_TOPOLOGY_ENABLED: Specify if custom topology label .dellemc.com/: # has to be used for making connection to backend PowerScale Array. # If X_CSI_CUSTOM_TOPOLOGY_ENABLED is set to true, then do not specify allowedTopologies in storage class. @@ -96,77 +90,67 @@ spec: # Default value: false - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" - # Specify kubelet config dir path. # Ensure that the config.yaml file is present at this path. # Default value: None - name: KUBELET_CONFIG_DIR value: "/var/lib/kubelet" - # certSecretCount: Represents number of certificate secrets, which user is going to create for # ssl authentication. (isilon-cert-0..isilon-cert-n) # Allowed values: n, where n > 0 # Default value: None - name: "CERT_SECRET_COUNT" value: "1" - # CSI driver log level # Allowed values: "error", "warn"/"warning", "info", "debug" # Default value: "debug" - name: "CSI_LOG_LEVEL" value: "debug" - controller: envs: - # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota - # on a newly provisioned volume. - # This requires SmartQuotas to be enabled on PowerScale cluster. - # Allowed values: - # true: set quota for volume - # false: do not set quota for volume - - name: X_CSI_ISI_QUOTA_ENABLED - value: "true" - - # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. - # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. - # Default value: System - # Examples: System, zone1 - - name: X_CSI_ISI_ACCESS_ZONE - value: "System" - - # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path - # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret - # Allowed values: valid octal mode number - # Default value: "0777" - # Examples: "0777", "777", "0755" - - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS - value: "0777" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. - # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the - # same exports are unresolvable/doesn't exist anymore. - # Allowed values: - # true: ignore existing unresolvable hosts and append new host to the existing export - # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails - # Default value: false - - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_ISI_QUOTA_ENABLED: Indicates whether the provisioner should attempt to set (later unset) quota + # on a newly provisioned volume. + # This requires SmartQuotas to be enabled on PowerScale cluster. + # Allowed values: + # true: set quota for volume + # false: do not set quota for volume + - name: X_CSI_ISI_QUOTA_ENABLED + value: "true" + # X_CSI_ISI_ACCESS_ZONE: The name of the access zone a volume can be created in. + # If storageclass is missing with AccessZone parameter, then value of X_CSI_ISI_ACCESS_ZONE is used for the same. + # Default value: System + # Examples: System, zone1 + - name: X_CSI_ISI_ACCESS_ZONE + value: "System" + # X_CSI_ISI_VOLUME_PATH_PERMISSIONS: The permissions for isi volume directory path + # This value acts as a default value for isiVolumePathPermissions, if not specified for a cluster config in secret + # Allowed values: valid octal mode number + # Default value: "0777" + # Examples: "0777", "777", "0755" + - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS + value: "0777" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS: Ignore unresolvable hosts on the OneFS. + # When set to true, OneFS allows new host to add to existing export list though any of the existing hosts from the + # same exports are unresolvable/doesn't exist anymore. + # Allowed values: + # true: ignore existing unresolvable hosts and append new host to the existing export + # false: exhibits OneFS default behavior i.e. if any of existing hosts are unresolvable while adding new one it fails + # Default value: false + - name: X_CSI_ISI_IGNORE_UNRESOLVABLE_HOSTS + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of controller deployment. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -184,42 +168,37 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - node: envs: - # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. - # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. - # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. - # Allowed values: n, where n >= 0 - # Default value: 0 - - name: X_CSI_MAX_VOLUMES_PER_NODE - value: "0" - - # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export - # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. - # Allowed values: list of one or more networks - # Default value: None - # Provide them in the following format: "[net1, net2]" - # CIDR format should be used - # eg: "[192.168.1.0/24, 192.168.100.0/22]" - - name: X_CSI_ALLOWED_NETWORKS - value: "" - - # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. - # Install the 'external-health-monitor' sidecar accordingly. - # Allowed values: - # true: enable checking of health condition of CSI volumes - # false: disable checking of health condition of CSI volumes - # Default value: false - - name: X_CSI_HEALTH_MONITOR_ENABLED - value: "false" - - # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. - # Default value: 192 - # Examples: 192, 256 - - name: X_CSI_MAX_PATH_LIMIT - value: "192" - + # X_CSI_MAX_VOLUMES_PER_NODE: Specify default value for maximum number of volumes that controller can publish to the node. + # If value is zero CO SHALL decide how many volumes of this type can be published by the controller to the node. + # This limit is applicable to all the nodes in the cluster for which node label 'max-isilon-volumes-per-node' is not set. + # Allowed values: n, where n >= 0 + # Default value: 0 + - name: X_CSI_MAX_VOLUMES_PER_NODE + value: "0" + # X_CSI_ALLOWED_NETWORKS: Custom networks for PowerScale export + # Specify list of networks which can be used for NFS I/O traffic; CIDR format should be used. + # Allowed values: list of one or more networks + # Default value: None + # Provide them in the following format: "[net1, net2]" + # CIDR format should be used + # eg: "[192.168.1.0/24, 192.168.100.0/22]" + - name: X_CSI_ALLOWED_NETWORKS + value: "" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin- volume status, volume condition. + # Install the 'external-health-monitor' sidecar accordingly. + # Allowed values: + # true: enable checking of health condition of CSI volumes + # false: disable checking of health condition of CSI volumes + # Default value: false + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + # X_CSI_MAX_PATH_LIMIT: this parameter is used for setting the maximum Path length for the given volume. + # Default value: 192 + # Examples: 192, 256 + - name: X_CSI_MAX_PATH_LIMIT + value: "192" # nodeSelector: Define node selection constraints for pods of node daemonset # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -265,7 +244,6 @@ spec: # - key: "isilon.podmon.storage.dell.com" # operator: "Exists" # effect: "NoSchedule" - sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] @@ -273,7 +251,6 @@ spec: - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -316,7 +293,6 @@ spec: - "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - "--ignoreVolumelessPods=false" - --- apiVersion: v1 kind: ConfigMap @@ -331,3 +307,6 @@ data: PODMON_CONTROLLER_LOG_FORMAT: "TEXT" PODMON_NODE_LOG_LEVEL: "debug" PODMON_NODE_LOG_FORMAT: "TEXT" +spec: + driver: + configVersion: v2.11.0 diff --git a/tests/e2e/testfiles/storage_csm_powerstore.yaml b/tests/e2e/testfiles/storage_csm_powerstore.yaml index 4181bbd09..ff0f5bda4 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore.yaml @@ -28,8 +28,7 @@ spec: # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" storageCapacity: false - # Config version for CSI PowerStore v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: powerstore-config # Controller count replicas: 2 @@ -49,7 +48,6 @@ spec: value: /var/lib/kubelet - name: CSI_LOG_LEVEL value: debug - sideCars: # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". @@ -88,7 +86,6 @@ spec: # Default Value: - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS value: - # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -125,7 +122,6 @@ spec: # Default value: "0" - name: X_CSI_POWERSTORE_MAX_VOLUMES_PER_NODE value: "0" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -144,7 +140,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -186,4 +181,4 @@ spec: - "--leaderelection=false" - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - - "--ignoreVolumelessPods=false" + - "--ignoreVolumelessPods=false" diff --git a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml index f4425eb68..e68045e2c 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml @@ -28,8 +28,7 @@ spec: # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" storageCapacity: false - # Config version for CSI PowerStore v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 authSecret: powerstore-config # Controller count replicas: 2 @@ -49,7 +48,6 @@ spec: value: /var/lib/kubelet - name: CSI_LOG_LEVEL value: debug - sideCars: # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". @@ -88,7 +86,6 @@ spec: # Default Value: - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS value: - # nodeSelector: Define node selection constraints for controller pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -125,7 +122,6 @@ spec: # Default value: "0" - name: X_CSI_POWERSTORE_MAX_VOLUMES_PER_NODE value: "0" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -144,7 +140,6 @@ spec: # - key: "node-role.kubernetes.io/control-plane" # operator: "Exists" # effect: "NoSchedule" - modules: - name: resiliency # enabled: Enable/Disable Resiliency feature @@ -186,4 +181,4 @@ spec: - "--leaderelection=false" - "--driver-config-params=/powerstore-config-params/driver-config-params.yaml" - "--driverPodLabelValue=dell-storage" - - "--ignoreVolumelessPods=false" + - "--ignoreVolumelessPods=false" diff --git a/tests/e2e/testfiles/storage_csm_unity.yaml b/tests/e2e/testfiles/storage_csm_unity.yaml index 365ebc1fc..1312230ca 100644 --- a/tests/e2e/testfiles/storage_csm_unity.yaml +++ b/tests/e2e/testfiles/storage_csm_unity.yaml @@ -16,15 +16,13 @@ spec: # true: enable storage capacity tracking # false: disable storage capacity tracking storageCapacity: true - # Config version for CSI Unity v2.10.1 driver - configVersion: v2.10.1 + configVersion: v2.11.0 # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false forceRemoveDriver: true common: - # Nightly Image for CSI Unity driver v2.10.1 image: "dellemc/csi-unity:nightly" imagePullPolicy: IfNotPresent envs: @@ -42,21 +40,19 @@ spec: value: debug - name: TENANT_NAME value: "" - sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner args: ["--volume-name-prefix=csivol"] - # health monitor is disabled by default, refer to driver documentation before enabling it - name: external-health-monitor enabled: false 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" - # Allowed values: 1m,2m,3m,...,10m,...,60m etc. Default value: 5m - #- name: provisioner - # args: ["--capacity-poll-interval=5m"] + # 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 + #- name: provisioner + # args: ["--capacity-poll-interval=5m"] controller: envs: # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from Controller plugin - volume condition. @@ -88,7 +84,6 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" - # nodeSelector: Define node selection constraints for node pods. # For the pod to be eligible to run on a node, the node must have each # of the indicated key-value pairs as labels. @@ -103,7 +98,7 @@ spec: # Leave as blank to install controller on worker nodes # Default value: None tolerations: - # Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint - # - key: "node-role.kubernetes.io/control-plane" - # operator: "Exists" - # effect: "NoSchedule" +# Uncomment if nodes you wish to use have the node-role.kubernetes.io/control-plane taint +# - key: "node-role.kubernetes.io/control-plane" +# operator: "Exists" +# effect: "NoSchedule" diff --git a/tests/shared/common.go b/tests/shared/common.go index cda84c40a..788e47bb0 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -27,18 +27,18 @@ import ( // ConfigVersions used for all unit tests const ( - PFlexConfigVersion string = "v2.10.1" - DowngradeConfigVersion string = "v2.8.0" - ConfigVersion string = "v2.8.0" - UpgradeConfigVersion string = "v2.9.0" + PFlexConfigVersion string = "v2.11.0" + DowngradeConfigVersion string = "v2.9.0" + ConfigVersion string = "v2.9.0" + UpgradeConfigVersion string = "v2.10.0" JumpUpgradeConfigVersion string = "v2.10.0" JumpDowngradeConfigVersion string = "v2.8.0" OldConfigVersion string = "v2.2.0" BadConfigVersion string = "v0" - PStoreConfigVersion string = "v2.10.1" - UnityConfigVersion string = "v2.10.1" - PScaleConfigVersion string = "v2.10.1" - PmaxConfigVersion string = "v2.10.1" + PStoreConfigVersion string = "v2.11.0" + UnityConfigVersion string = "v2.11.0" + PScaleConfigVersion string = "v2.11.0" + PmaxConfigVersion string = "v2.11.0" AuthServerConfigVersion string = "v1.10.0" AccConfigVersion string = "v1.0.0" ) From d36a00be2b3fa2497fb41ddf15eb59c987147e0a Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 14:38:34 +0530 Subject: [PATCH 03/15] upgrade modules --- ...ll-csm-operator.clusterserviceversion.yaml | 106 +++++++++--------- config/manager/manager.yaml | 18 +-- ...ll-csm-operator.clusterserviceversion.yaml | 18 +-- config/samples/storage_v1_csm_powerflex.yaml | 22 ++-- config/samples/storage_v1_csm_powermax.yaml | 21 ++-- config/samples/storage_v1_csm_powerscale.yaml | 22 ++-- config/samples/storage_v1_csm_powerstore.yaml | 6 +- controllers/csm_controller_test.go | 10 +- deploy/operator.yaml | 30 ++--- .../{v1.8.0 => v1.11.0}/cert-manager.yaml | 0 .../{v1.8.0 => v1.11.0}/container.yaml | 2 +- .../{v1.8.0 => v1.11.0}/deployment.yaml | 10 +- .../{v1.8.0 => v1.11.0}/ingress.yaml | 9 ++ .../v1.11.0/local-provisioner.yaml | 21 ++++ .../nginx-ingress-controller.yaml | 0 .../{v1.8.0 => v1.11.0}/policies.yaml | 0 .../{v1.8.0 => v1.11.0}/volumes.yaml | 0 .../authorization/v1.8.0/upgrade-path.yaml | 1 - .../moduleconfig/common/version-values.yaml | 32 +++--- .../{v2.7.0 => v2.10.0}/controller.yaml | 0 .../{v1.6.0 => v1.9.0}/custom-cert.yaml | 0 .../karavi-metrics-powerflex.yaml | 0 .../karavi-metrics-powermax.yaml | 0 .../karavi-metrics-powerscale.yaml | 0 .../karavi-otel-collector.yaml | 0 .../{v1.6.0 => v1.9.0}/karavi-topology.yaml | 0 .../{v1.6.0 => v1.9.0}/selfsigned-cert.yaml | 0 .../{v1.6.0 => v1.9.0}/container.yaml | 2 +- .../{v1.6.0 => v1.9.0}/controller.yaml | 0 .../replicationcrds.all.yaml | 0 .../replication/{v1.6.0 => v1.9.0}/rules.yaml | 0 .../container-powerflex-controller.yaml | 2 +- .../container-powerflex-node.yaml | 2 +- .../container-powerscale-controller.yaml | 2 +- .../container-powerscale-node.yaml | 2 +- .../container-powerstore-controller.yaml | 2 +- .../container-powerstore-node.yaml | 2 +- .../{v1.7.0 => v1.10.0}/controller-roles.yaml | 0 .../{v1.7.0 => v1.10.0}/node-roles.yaml | 0 pkg/modules/authorization_test.go | 6 +- pkg/modules/testdata/cr_auth_proxy.yaml | 10 +- .../testdata/cr_auth_proxy_no_redis.yaml | 10 +- .../testdata/cr_powerflex_observability.yaml | 8 +- ...r_powerflex_observability_custom_cert.yaml | 6 +- ...observability_custom_cert_missing_key.yaml | 6 +- .../testdata/cr_powerflex_replica.yaml | 4 +- .../testdata/cr_powerflex_resiliency.yaml | 6 +- .../testdata/cr_powermax_observability.yaml | 8 +- pkg/modules/testdata/cr_powermax_replica.yaml | 4 +- .../testdata/cr_powermax_reverseproxy.yaml | 7 +- pkg/modules/testdata/cr_powerscale_auth.yaml | 2 +- .../cr_powerscale_auth_validate_cert.yaml | 2 +- .../testdata/cr_powerscale_observability.yaml | 8 +- .../testdata/cr_powerscale_replica.yaml | 4 +- .../testdata/cr_powerscale_resiliency.yaml | 6 +- .../testdata/cr_powerstore_resiliency.yaml | 2 +- ...icate_v180.yaml => certificate_v1110.yaml} | 0 ...csm_authorization_proxy_server_v1110.yaml} | 21 ++-- samples/storage_csm_powerflex_v2110.yaml | 22 ++-- samples/storage_csm_powermax_v2110.yaml | 21 ++-- samples/storage_csm_powerscale_v2110.yaml | 22 ++-- samples/storage_csm_powerstore_v2110.yaml | 6 +- .../unity/v2.10.0/controller.yaml | 2 +- .../unity/v2.10.1/controller.yaml | 2 +- .../unity/v2.11.0/controller.yaml | 2 +- .../csm_authorization_proxy_server.yaml | 2 +- ...csm_authorization_proxy_server_alt_ns.yaml | 2 +- ...horization_proxy_server_default_redis.yaml | 2 +- ..._authorization_proxy_server_n_minus_1.yaml | 10 +- ...sm_authorization_proxy_server_no_cert.yaml | 2 +- .../e2e/testfiles/storage_csm_powerflex.yaml | 12 +- .../storage_csm_powerflex_alt_vals_1.yaml | 10 +- .../storage_csm_powerflex_alt_vals_2.yaml | 10 +- .../storage_csm_powerflex_alt_vals_3.yaml | 10 +- .../storage_csm_powerflex_alt_vals_4.yaml | 10 +- .../testfiles/storage_csm_powerflex_auth.yaml | 2 +- ...sm_powerflex_auth_driver_only_upgrade.yaml | 4 +- .../storage_csm_powerflex_auth_n_minus_1.yaml | 4 +- .../storage_csm_powerflex_downgrade.yaml | 18 +-- .../storage_csm_powerflex_health_monitor.yaml | 10 +- .../storage_csm_powerflex_observability.yaml | 2 +- ...rage_csm_powerflex_observability_auth.yaml | 4 +- ...m_powerflex_observability_custom_cert.yaml | 2 +- ...erflex_observability_otel_custom_cert.yaml | 2 +- .../storage_csm_powerflex_replica.yaml | 6 +- .../storage_csm_powerflex_resiliency.yaml | 2 +- tests/e2e/testfiles/storage_csm_powermax.yaml | 5 +- .../storage_csm_powermax_observability.yaml | 11 +- .../e2e/testfiles/storage_csm_powerscale.yaml | 16 +-- .../storage_csm_powerscale_alt_vals_1.yaml | 16 +-- .../storage_csm_powerscale_alt_vals_2.yaml | 16 +-- .../storage_csm_powerscale_alt_vals_3.yaml | 16 +-- .../storage_csm_powerscale_auth.yaml | 2 +- ...storage_csm_powerscale_health_monitor.yaml | 16 +-- .../storage_csm_powerscale_observability.yaml | 12 +- ...age_csm_powerscale_observability_auth.yaml | 8 +- ...erscale_observability_top_custom_cert.yaml | 12 +- .../storage_csm_powerscale_replica.yaml | 16 +-- .../storage_csm_powerscale_resiliency.yaml | 2 +- .../e2e/testfiles/storage_csm_powerstore.yaml | 2 +- .../storage_csm_powerstore_resiliency.yaml | 2 +- tests/shared/common.go | 2 +- 102 files changed, 422 insertions(+), 397 deletions(-) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/cert-manager.yaml (100%) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/container.yaml (93%) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/deployment.yaml (98%) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/ingress.yaml (80%) create mode 100644 operatorconfig/moduleconfig/authorization/v1.11.0/local-provisioner.yaml rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/nginx-ingress-controller.yaml (100%) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/policies.yaml (100%) rename operatorconfig/moduleconfig/authorization/{v1.8.0 => v1.11.0}/volumes.yaml (100%) delete mode 100644 operatorconfig/moduleconfig/authorization/v1.8.0/upgrade-path.yaml rename operatorconfig/moduleconfig/csireverseproxy/{v2.7.0 => v2.10.0}/controller.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/custom-cert.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/karavi-metrics-powerflex.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/karavi-metrics-powermax.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/karavi-metrics-powerscale.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/karavi-otel-collector.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/karavi-topology.yaml (100%) rename operatorconfig/moduleconfig/observability/{v1.6.0 => v1.9.0}/selfsigned-cert.yaml (100%) rename operatorconfig/moduleconfig/replication/{v1.6.0 => v1.9.0}/container.yaml (94%) rename operatorconfig/moduleconfig/replication/{v1.6.0 => v1.9.0}/controller.yaml (100%) rename operatorconfig/moduleconfig/replication/{v1.6.0 => v1.9.0}/replicationcrds.all.yaml (100%) rename operatorconfig/moduleconfig/replication/{v1.6.0 => v1.9.0}/rules.yaml (100%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerflex-controller.yaml (97%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerflex-node.yaml (98%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerscale-controller.yaml (97%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerscale-node.yaml (98%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerstore-controller.yaml (97%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/container-powerstore-node.yaml (98%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/controller-roles.yaml (100%) rename operatorconfig/moduleconfig/resiliency/{v1.7.0 => v1.10.0}/node-roles.yaml (100%) rename samples/authorization/{certificate_v180.yaml => certificate_v1110.yaml} (100%) rename samples/authorization/{csm_authorization_proxy_server_v180.yaml => csm_authorization_proxy_server_v1110.yaml} (68%) diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index f42e15cb5..1190cb958 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -217,11 +217,11 @@ metadata: "value": "true" } ], - "image": "dellemc/csm-authorization-sidecar:v1.10.1", + "image": "dellemc/csm-authorization-sidecar:v1.11.0", "name": "karavi-authorization-proxy" } ], - "configVersion": "v1.10.1", + "configVersion": "v1.11.0", "enabled": false, "name": "authorization" }, @@ -238,7 +238,7 @@ metadata: "value": "powerscale" } ], - "image": "dellemc/dell-csi-replicator:v1.8.1", + "image": "dellemc/dell-csi-replicator:v1.9.0", "name": "dell-csi-replicator" }, { @@ -264,11 +264,11 @@ metadata: "value": "5m" } ], - "image": "dellemc/dell-replication-controller:v1.8.1", + "image": "dellemc/dell-replication-controller:v1.9.0", "name": "dell-replication-controller-manager" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "replication" }, @@ -283,7 +283,7 @@ metadata: "value": "INFO" } ], - "image": "dellemc/csm-topology:v1.8.1", + "image": "dellemc/csm-topology:v1.9.0", "name": "topology", "privateKey": "" }, @@ -356,11 +356,11 @@ metadata: "value": "otel-collector:55680" } ], - "image": "dellemc/csm-metrics-powerscale:v1.5.1", + "image": "dellemc/csm-metrics-powerscale:v1.6.0", "name": "metrics-powerscale" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "observability" }, @@ -379,7 +379,7 @@ metadata: "--driverPath=csi-isilon.dellemc.com", "--driver-config-params=/csi-isilon-config-params/driver-config-params.yaml" ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-controller" }, @@ -401,12 +401,12 @@ metadata: "value": "8083" } ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-node" } ], - "configVersion": "v1.9.1", + "configVersion": "v1.10.0", "enabled": false, "name": "resiliency" } @@ -587,11 +587,11 @@ metadata: "value": "powermax-reverseproxy-config" } ], - "image": "dellemc/csipowermax-reverseproxy:v2.9.1", + "image": "dellemc/csipowermax-reverseproxy:v2.10.0", "name": "csipowermax-reverseproxy" } ], - "configVersion": "v2.9.1", + "configVersion": "v2.10.0", "enabled": true, "forceRemoveModule": true, "name": "csireverseproxy" @@ -609,11 +609,11 @@ metadata: "value": "true" } ], - "image": "dellemc/csm-authorization-sidecar:v1.10.1", + "image": "dellemc/csm-authorization-sidecar:v1.11.0", "name": "karavi-authorization-proxy" } ], - "configVersion": "v1.10.1", + "configVersion": "v1.11.0", "enabled": false, "name": "authorization" }, @@ -630,7 +630,7 @@ metadata: "value": "powermax" } ], - "image": "dellemc/dell-csi-replicator:v1.8.1", + "image": "dellemc/dell-csi-replicator:v1.9.0", "name": "dell-csi-replicator" }, { @@ -656,11 +656,11 @@ metadata: "value": "5m" } ], - "image": "dellemc/dell-replication-controller:v1.8.1", + "image": "dellemc/dell-replication-controller:v1.9.0", "name": "dell-replication-controller-manager" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "replication" }, @@ -675,7 +675,7 @@ metadata: "value": "INFO" } ], - "image": "dellemc/csm-topology:v1.8.1", + "image": "dellemc/csm-topology:v1.9.0", "name": "topology", "privateKey": "" }, @@ -736,11 +736,11 @@ metadata: "value": "powermax-reverseproxy-config" } ], - "image": "dellemc/csm-metrics-powermax:v1.3.1", + "image": "dellemc/csm-metrics-powermax:v1.4.0", "name": "metrics-powermax" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "observability" } @@ -879,7 +879,7 @@ metadata: "--driver-config-params=/powerstore-config-params/driver-config-params.yaml", "--driverPath=csi-powerstore.dellemc.com" ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-controller" }, @@ -901,12 +901,12 @@ metadata: "value": "8083" } ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-node" } ], - "configVersion": "v1.9.1", + "configVersion": "v1.10.0", "enabled": false, "name": "resiliency" } @@ -1203,11 +1203,11 @@ metadata: "value": "true" } ], - "image": "dellemc/csm-authorization-sidecar:v1.10.1", + "image": "dellemc/csm-authorization-sidecar:v1.11.0", "name": "karavi-authorization-proxy" } ], - "configVersion": "v1.10.1", + "configVersion": "v1.11.0", "enabled": false, "name": "authorization" }, @@ -1222,7 +1222,7 @@ metadata: "value": "INFO" } ], - "image": "dellemc/csm-topology:v1.8.1", + "image": "dellemc/csm-topology:v1.9.0", "name": "topology", "privateKey": "" }, @@ -1287,11 +1287,11 @@ metadata: "value": "otel-collector:55680" } ], - "image": "dellemc/csm-metrics-powerflex:v1.8.1", + "image": "dellemc/csm-metrics-powerflex:v1.9.0", "name": "metrics-powerflex" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "observability" }, @@ -1308,7 +1308,7 @@ metadata: "value": "powerflex" } ], - "image": "dellemc/dell-csi-replicator:v1.8.1", + "image": "dellemc/dell-csi-replicator:v1.9.0", "name": "dell-csi-replicator" }, { @@ -1334,11 +1334,11 @@ metadata: "value": "5m" } ], - "image": "dellemc/dell-replication-controller:v1.8.1", + "image": "dellemc/dell-replication-controller:v1.9.0", "name": "dell-replication-controller-manager" } ], - "configVersion": "v1.8.1", + "configVersion": "v1.9.0", "enabled": false, "name": "replication" }, @@ -1356,7 +1356,7 @@ metadata: "--mode=controller", "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-controller" }, @@ -1377,12 +1377,12 @@ metadata: "value": "8083" } ], - "image": "dellemc/podmon:v1.9.1", + "image": "dellemc/podmon:v1.10.0", "imagePullPolicy": "IfNotPresent", "name": "podmon-node" } ], - "configVersion": "v1.9.1", + "configVersion": "v1.10.0", "enabled": false, "name": "resiliency" } @@ -3696,7 +3696,7 @@ spec: - name: RELATED_IMAGE_csi-powermax value: docker.io/dellemc/csi-powermax:v2.11.0 - name: RELATED_IMAGE_csipowermax-reverseproxy - value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 + value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 - name: RELATED_IMAGE_csi-powerstore value: docker.io/dellemc/csi-powerstore:v2.11.0 - name: RELATED_IMAGE_csi-unity @@ -3706,23 +3706,23 @@ spec: - 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 + value: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 - name: RELATED_IMAGE_dell-csi-replicator - value: docker.io/dellemc/dell-csi-replicator:v1.8.1 + value: docker.io/dellemc/dell-csi-replicator:v1.9.0 - name: RELATED_IMAGE_dell-replication-controller-manager - value: docker.io/dellemc/dell-replication-controller:v1.8.1 + value: docker.io/dellemc/dell-replication-controller:v1.9.0 - name: RELATED_IMAGE_topology - value: docker.io/dellemc/csm-topology:v1.8.1 + value: docker.io/dellemc/csm-topology:v1.9.0 - name: RELATED_IMAGE_otel-collector value: docker.io/otel/opentelemetry-collector:0.42.0 - name: RELATED_IMAGE_metrics-powerscale - value: docker.io/dellemc/csm-metrics-powerscale:v1.5.1 + value: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 - name: RELATED_IMAGE_metrics-powermax - value: docker.io/dellemc/csm-metrics-powermax:v1.3.1 + value: docker.io/dellemc/csm-metrics-powermax:v1.4.0 - name: RELATED_IMAGE_metrics-powerflex - value: docker.io/dellemc/csm-metrics-powerflex:v1.8.1 + value: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 - name: RELATED_IMAGE_podmon-node - value: docker.io/dellemc/podmon:v1.9.1 + value: docker.io/dellemc/podmon:v1.10.0 - name: RELATED_IMAGE_kube-rbac-proxy value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 - name: RELATED_IMAGE_attacher @@ -3810,7 +3810,7 @@ spec: name: csi-isilon - image: docker.io/dellemc/csi-powermax:v2.11.0 name: csi-powermax - - image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 + - image: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 name: csipowermax-reverseproxy - image: docker.io/dellemc/csi-powerstore:v2.11.0 name: csi-powerstore @@ -3820,23 +3820,23 @@ spec: name: csi-vxflexos - image: docker.io/dellemc/sdc:4.5.1 name: sdc - - image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 + - image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 name: karavi-authorization-proxy - - image: docker.io/dellemc/dell-csi-replicator:v1.8.1 + - image: docker.io/dellemc/dell-csi-replicator:v1.9.0 name: dell-csi-replicator - - image: docker.io/dellemc/dell-replication-controller:v1.8.1 + - image: docker.io/dellemc/dell-replication-controller:v1.9.0 name: dell-replication-controller-manager - - image: docker.io/dellemc/csm-topology:v1.8.1 + - image: docker.io/dellemc/csm-topology:v1.9.0 name: topology - image: docker.io/otel/opentelemetry-collector:0.42.0 name: otel-collector - - image: docker.io/dellemc/csm-metrics-powerscale:v1.5.1 + - image: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 name: metrics-powerscale - - image: docker.io/dellemc/csm-metrics-powermax:v1.3.1 + - image: docker.io/dellemc/csm-metrics-powermax:v1.4.0 name: metrics-powermax - - image: docker.io/dellemc/csm-metrics-powerflex:v1.8.1 + - image: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 name: metrics-powerflex - - image: docker.io/dellemc/podmon:v1.9.1 + - image: docker.io/dellemc/podmon:v1.10.0 name: podmon-node - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: kube-rbac-proxy diff --git a/config/manager/manager.yaml b/config/manager/manager.yaml index 975f95bb4..0bc5c4fe1 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -35,7 +35,7 @@ spec: name: RELATED_IMAGE_csi-isilon - value: docker.io/dellemc/csi-powermax:v2.10.0 name: RELATED_IMAGE_csi-powermax - - value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0 + - value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 name: RELATED_IMAGE_csipowermax-reverseproxy - value: docker.io/dellemc/csi-powerstore:v2.10.0 name: RELATED_IMAGE_csi-powerstore @@ -45,23 +45,23 @@ spec: name: RELATED_IMAGE_csi-vxflexos - value: docker.io/dellemc/sdc:4.5.1 name: RELATED_IMAGE_sdc - - value: docker.io/dellemc/csm-authorization-sidecar:v1.10.0 + - value: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 name: RELATED_IMAGE_karavi-authorization-proxy - - value: docker.io/dellemc/dell-csi-replicator:v1.8.0 + - value: docker.io/dellemc/dell-csi-replicator:v1.9.0 name: RELATED_IMAGE_dell-csi-replicator - - value: docker.io/dellemc/dell-replication-controller:v1.8.0 + - value: docker.io/dellemc/dell-replication-controller:v1.9.0 name: RELATED_IMAGE_dell-replication-controller-manager - - value: docker.io/dellemc/csm-topology:v1.8.0 + - value: docker.io/dellemc/csm-topology:v1.9.0 name: RELATED_IMAGE_topology - value: docker.io/otel/opentelemetry-collector:0.42.0 name: RELATED_IMAGE_otel-collector - - value: docker.io/dellemc/csm-metrics-powerscale:v1.5.0 + - value: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 name: RELATED_IMAGE_metrics-powerscale - - value: docker.io/dellemc/csm-metrics-powermax:v1.3.0 + - value: docker.io/dellemc/csm-metrics-powermax:v1.4.0 name: RELATED_IMAGE_metrics-powermax - - value: docker.io/dellemc/csm-metrics-powerflex:v1.8.0 + - value: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 name: RELATED_IMAGE_metrics-powerflex - - value: docker.io/dellemc/podmon:v1.9.0 + - value: docker.io/dellemc/podmon:v1.10.0 name: RELATED_IMAGE_podmon-node - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: RELATED_IMAGE_kube-rbac-proxy diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index 8dbd16927..0b78d3697 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -1245,7 +1245,7 @@ spec: name: csi-isilon - image: docker.io/dellemc/csi-powermax:v2.11.0 name: csi-powermax - - image: docker.io/dellemc/csipowermax-reverseproxy:v2.9.1 + - image: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 name: csipowermax-reverseproxy - image: docker.io/dellemc/csi-powerstore:v2.11.0 name: csi-powerstore @@ -1255,23 +1255,23 @@ spec: name: csi-vxflexos - image: docker.io/dellemc/sdc:4.5.1 name: sdc - - image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 + - image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 name: karavi-authorization-proxy - - image: docker.io/dellemc/dell-csi-replicator:v1.8.1 + - image: docker.io/dellemc/dell-csi-replicator:v1.9.0 name: dell-csi-replicator - - image: docker.io/dellemc/dell-replication-controller:v1.8.1 + - image: docker.io/dellemc/dell-replication-controller:v1.9.0 name: dell-replication-controller-manager - - image: docker.io/dellemc/csm-topology:v1.8.1 + - image: docker.io/dellemc/csm-topology:v1.9.0 name: topology - image: docker.io/otel/opentelemetry-collector:0.42.0 name: otel-collector - - image: docker.io/dellemc/csm-metrics-powerscale:v1.5.1 + - image: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 name: metrics-powerscale - - image: docker.io/dellemc/csm-metrics-powermax:v1.3.1 + - image: docker.io/dellemc/csm-metrics-powermax:v1.4.0 name: metrics-powermax - - image: docker.io/dellemc/csm-metrics-powerflex:v1.8.1 + - image: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 name: metrics-powerflex - - image: docker.io/dellemc/podmon:v1.9.1 + - image: docker.io/dellemc/podmon:v1.10.0 name: podmon-node - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: kube-rbac-proxy diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 804a54928..8e065cb46 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -183,10 +183,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -198,14 +198,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -251,7 +251,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -312,13 +312,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -332,7 +332,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -365,10 +365,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -382,7 +382,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index 46f99f372..97a22fa3e 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/config/samples/storage_v1_csm_powermax.yaml @@ -241,13 +241,12 @@ spec: # enabled: Always set to true enabled: true forceRemoveModule: true - configVersion: v2.9.1 + configVersion: v2.10.0 components: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -263,10 +262,10 @@ spec: - name: authorization # enabled: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -283,13 +282,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -304,7 +303,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -334,14 +333,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -387,7 +386,7 @@ spec: # enabled: Enable/Disable PowerMax metrics enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.3.1 + image: dellemc/csm-metrics-powermax:v1.4.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index 494df1280..56b3170c0 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/config/samples/storage_v1_csm_powerscale.yaml @@ -251,10 +251,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -271,13 +271,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -292,7 +292,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -322,14 +322,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -376,7 +376,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -445,10 +445,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -463,7 +463,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.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/config/samples/storage_v1_csm_powerstore.yaml b/config/samples/storage_v1_csm_powerstore.yaml index 92a188cc9..a293332e1 100644 --- a/config/samples/storage_v1_csm_powerstore.yaml +++ b/config/samples/storage_v1_csm_powerstore.yaml @@ -176,10 +176,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powerstore" @@ -194,7 +194,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.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index 70f6525a9..05e5a6f68 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -1293,7 +1293,7 @@ func getObservabilityModule() []csmv1.Module { { Name: csmv1.Observability, Enabled: true, - ConfigVersion: "v1.8.0", + ConfigVersion: "v1.9.0", Components: []csmv1.ContainerTemplate{ { Name: "topology", @@ -1345,7 +1345,7 @@ func getReplicaModule() []csmv1.Module { { Name: csmv1.Replication, Enabled: true, - ConfigVersion: "v1.6.0", + ConfigVersion: "v1.9.0", Components: []csmv1.ContainerTemplate{ { Name: utils.ReplicationSideCarName, @@ -1369,7 +1369,7 @@ func getResiliencyModule() []csmv1.Module { { Name: csmv1.Resiliency, Enabled: true, - ConfigVersion: "v1.9.0", + ConfigVersion: "v1.10.0", Components: []csmv1.ContainerTemplate{ { Name: utils.ResiliencySideCarName, @@ -1384,7 +1384,7 @@ func getAuthModule() []csmv1.Module { { Name: csmv1.Authorization, Enabled: true, - ConfigVersion: "v1.8.0", + ConfigVersion: "v1.11.0", Components: []csmv1.ContainerTemplate{ { Name: "karavi-authorization-proxy", @@ -1405,7 +1405,7 @@ func getAuthProxyServer() []csmv1.Module { { Name: csmv1.AuthorizationServer, Enabled: true, - ConfigVersion: "v1.10.0", + ConfigVersion: "v1.11.0", Components: []csmv1.ContainerTemplate{ { Name: "karavi-authorization-proxy-server", diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 4d19b168b..17b12bb01 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1261,37 +1261,37 @@ spec: - name: RELATED_IMAGE_dell-csm-operator value: docker.io/dellemc/dell-csm-operator:v1.6.0 - name: RELATED_IMAGE_csi-isilon - value: docker.io/dellemc/csi-isilon:v2.10.0 + value: docker.io/dellemc/csi-isilon:v2.11.0 - name: RELATED_IMAGE_csi-powermax - value: docker.io/dellemc/csi-powermax:v2.10.0 + value: docker.io/dellemc/csi-powermax:v2.11.0 - name: RELATED_IMAGE_csipowermax-reverseproxy - value: docker.io/dellemc/csipowermax-reverseproxy:v2.9.0 + value: docker.io/dellemc/csipowermax-reverseproxy:v2.10.0 - name: RELATED_IMAGE_csi-powerstore - value: docker.io/dellemc/csi-powerstore:v2.10.0 + value: docker.io/dellemc/csi-powerstore:v2.11.0 - name: RELATED_IMAGE_csi-unity - value: docker.io/dellemc/csi-unity:v2.10.0 + value: docker.io/dellemc/csi-unity:v2.11.0 - name: RELATED_IMAGE_csi-vxflexos - value: docker.io/dellemc/csi-vxflexos:v2.10.0 + value: docker.io/dellemc/csi-vxflexos:v2.11.0 - name: RELATED_IMAGE_sdc value: docker.io/dellemc/sdc:4.5.1 - name: RELATED_IMAGE_karavi-authorization-proxy - value: docker.io/dellemc/csm-authorization-sidecar:v1.10.0 + value: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 - name: RELATED_IMAGE_dell-csi-replicator - value: docker.io/dellemc/dell-csi-replicator:v1.8.0 + value: docker.io/dellemc/dell-csi-replicator:v1.9.0 - name: RELATED_IMAGE_dell-replication-controller-manager - value: docker.io/dellemc/dell-replication-controller:v1.8.0 + value: docker.io/dellemc/dell-replication-controller:v1.9.0 - name: RELATED_IMAGE_topology - value: docker.io/dellemc/csm-topology:v1.8.0 + value: docker.io/dellemc/csm-topology:v1.9.0 - name: RELATED_IMAGE_otel-collector value: docker.io/otel/opentelemetry-collector:0.42.0 - name: RELATED_IMAGE_metrics-powerscale - value: docker.io/dellemc/csm-metrics-powerscale:v1.5.0 + value: docker.io/dellemc/csm-metrics-powerscale:v1.6.0 - name: RELATED_IMAGE_metrics-powermax - value: docker.io/dellemc/csm-metrics-powermax:v1.3.0 + value: docker.io/dellemc/csm-metrics-powermax:v1.4.0 - name: RELATED_IMAGE_metrics-powerflex - value: docker.io/dellemc/csm-metrics-powerflex:v1.8.0 + value: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 - name: RELATED_IMAGE_podmon-node - value: docker.io/dellemc/podmon:v1.9.0 + value: docker.io/dellemc/podmon:v1.10.0 - name: RELATED_IMAGE_kube-rbac-proxy value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 - name: RELATED_IMAGE_attacher @@ -1312,7 +1312,7 @@ spec: value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 - name: RELATED_IMAGE_cert-persister value: docker.io/dellemc/connectivity-cert-persister-k8s:0.11.0 - image: docker.io/dellemc/dell-csm-operator:v1.5.0 + image: docker.io/dellemc/dell-csm-operator:v1.6.0 imagePullPolicy: Always livenessProbe: httpGet: diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/cert-manager.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/cert-manager.yaml similarity index 100% rename from operatorconfig/moduleconfig/authorization/v1.8.0/cert-manager.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/cert-manager.yaml diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/container.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/container.yaml similarity index 93% rename from operatorconfig/moduleconfig/authorization/v1.8.0/container.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/container.yaml index 03296def6..604f7f5bb 100644 --- a/operatorconfig/moduleconfig/authorization/v1.8.0/container.yaml +++ b/operatorconfig/moduleconfig/authorization/v1.11.0/container.yaml @@ -1,6 +1,6 @@ name: karavi-authorization-proxy imagePullPolicy: IfNotPresent -image: dellemc/csm-authorization-sidecar:v1.8.0 +image: dellemc/csm-authorization-sidecar:v1.11.0 env: - name: PROXY_HOST value: "" diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/deployment.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/deployment.yaml similarity index 98% rename from operatorconfig/moduleconfig/authorization/v1.8.0/deployment.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/deployment.yaml index 344d0258f..e6f3c7992 100644 --- a/operatorconfig/moduleconfig/authorization/v1.8.0/deployment.yaml +++ b/operatorconfig/moduleconfig/authorization/v1.11.0/deployment.yaml @@ -50,7 +50,7 @@ spec: image: imagePullPolicy: IfNotPresent args: - - "--policies=" + - "--policies=authorization" - "--enable-data" volumes: - name: config-volume @@ -448,10 +448,10 @@ rules: kind: ClusterRoleBinding apiVersion: rbac.authorization.k8s.io/v1 metadata: - name: system:serviceaccounts: + name: system:serviceaccounts:authorization subjects: - kind: Group - name: system:serviceaccounts: + name: system:serviceaccounts:authorization namespace: roleRef: kind: ClusterRole @@ -475,7 +475,7 @@ roleRef: apiGroup: rbac.authorization.k8s.io subjects: - kind: Group - name: system:serviceaccounts: + name: system:serviceaccounts:authorization apiGroup: rbac.authorization.k8s.io --- # Define role for OPA/kube-mgmt to update configmaps with policy status. @@ -501,5 +501,5 @@ roleRef: apiGroup: rbac.authorization.k8s.io subjects: - kind: Group - name: system:serviceaccounts: + name: system:serviceaccounts:authorization apiGroup: rbac.authorization.k8s.io diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/ingress.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/ingress.yaml similarity index 80% rename from operatorconfig/moduleconfig/authorization/v1.8.0/ingress.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/ingress.yaml index 9a7477ad3..a9de55512 100644 --- a/operatorconfig/moduleconfig/authorization/v1.8.0/ingress.yaml +++ b/operatorconfig/moduleconfig/authorization/v1.11.0/ingress.yaml @@ -31,3 +31,12 @@ spec: name: proxy-server port: number: 8080 + - http: + paths: + - backend: + service: + name: proxy-server + port: + number: 8080 + path: / + pathType: Prefix diff --git a/operatorconfig/moduleconfig/authorization/v1.11.0/local-provisioner.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/local-provisioner.yaml new file mode 100644 index 000000000..eba2e6c84 --- /dev/null +++ b/operatorconfig/moduleconfig/authorization/v1.11.0/local-provisioner.yaml @@ -0,0 +1,21 @@ +apiVersion: storage.k8s.io/v1 +kind: StorageClass +metadata: + name: csm-authorization-local-storage +provisioner: kubernetes.io/no-provisioner +volumeBindingMode: WaitForFirstConsumer +--- +apiVersion: v1 +kind: PersistentVolume +metadata: + name: csm-authorization-redis +spec: + capacity: + storage: 8Gi + volumeMode: Filesystem + accessModes: + - ReadWriteOnce + persistentVolumeReclaimPolicy: Recycle + storageClassName: csm-authorization-local-storage + hostPath: + path: /csm-authorization/redis \ No newline at end of file diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/nginx-ingress-controller.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/nginx-ingress-controller.yaml similarity index 100% rename from operatorconfig/moduleconfig/authorization/v1.8.0/nginx-ingress-controller.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/nginx-ingress-controller.yaml diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/policies.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/policies.yaml similarity index 100% rename from operatorconfig/moduleconfig/authorization/v1.8.0/policies.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/policies.yaml diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/volumes.yaml b/operatorconfig/moduleconfig/authorization/v1.11.0/volumes.yaml similarity index 100% rename from operatorconfig/moduleconfig/authorization/v1.8.0/volumes.yaml rename to operatorconfig/moduleconfig/authorization/v1.11.0/volumes.yaml diff --git a/operatorconfig/moduleconfig/authorization/v1.8.0/upgrade-path.yaml b/operatorconfig/moduleconfig/authorization/v1.8.0/upgrade-path.yaml deleted file mode 100644 index be786dc83..000000000 --- a/operatorconfig/moduleconfig/authorization/v1.8.0/upgrade-path.yaml +++ /dev/null @@ -1 +0,0 @@ -minUpgradePath: v1.7.0 \ No newline at end of file diff --git a/operatorconfig/moduleconfig/common/version-values.yaml b/operatorconfig/moduleconfig/common/version-values.yaml index 05df0d063..2a9d96755 100644 --- a/operatorconfig/moduleconfig/common/version-values.yaml +++ b/operatorconfig/moduleconfig/common/version-values.yaml @@ -1,11 +1,6 @@ # Driver Type powerscale: # List of Driver versions and modules that supports the version - v2.8.0: - authorization: "v1.8.0" - replication: "v1.6.0" - observability: "v1.6.0" - resiliency: "v1.7.0" v2.9.0: authorization: "v1.9.0" replication: "v1.7.0" @@ -26,13 +21,13 @@ powerscale: replication: "v1.8.1" observability: "v1.8.1" resiliency: "v1.9.1" + v2.11.0: + authorization: "v1.11.0" + replication: "v1.9.0" + observability: "v1.9.0" + resiliency: "v1.10.0" powerflex: # List of Driver versions and modules that supports the version - v2.8.0: - authorization: "v1.7.0" - observability: "v1.6.0" - replication: "v1.6.0" - resiliency: "v1.6.0" v2.9.0: authorization: "v1.9.0" observability: "v1.7.0" @@ -58,10 +53,13 @@ powerflex: observability: "v1.8.1" replication: "v1.8.1" resiliency: "v1.9.1" + v2.11.0: + authorization: "v1.11.0" + observability: "v1.9.0" + replication: "v1.9.0" + resiliency: "v1.10.0" powerstore: # List of Driver versions and modules that supports the version - v2.8.0: - resiliency: "v1.7.0" v2.9.0: resiliency: "v1.8.0" v2.9.1: @@ -70,12 +68,10 @@ powerstore: resiliency: "v1.9.0" v2.10.1: resiliency: "v1.9.1" + v2.11.0: + resiliency: "v1.10.0" powermax: # List of Driver versions and modules that supports the version - v2.8.0: - csireverseproxy: "v2.7.0" - authorization: "v1.7.0" - replication: "v1.6.0" v2.9.0: csireverseproxy: "v2.8.0" authorization: "v1.9.0" @@ -92,3 +88,7 @@ powermax: csireverseproxy: "v2.9.1" authorization: "v1.10.1" replication: "v1.8.1" + v2.11.0: + csireverseproxy: "v2.10.0" + authorization: "v1.11.0" + replication: "v1.9.0" diff --git a/operatorconfig/moduleconfig/csireverseproxy/v2.7.0/controller.yaml b/operatorconfig/moduleconfig/csireverseproxy/v2.10.0/controller.yaml similarity index 100% rename from operatorconfig/moduleconfig/csireverseproxy/v2.7.0/controller.yaml rename to operatorconfig/moduleconfig/csireverseproxy/v2.10.0/controller.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/custom-cert.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/custom-cert.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/custom-cert.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/custom-cert.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerflex.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powerflex.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerflex.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powerflex.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powermax.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powermax.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powermax.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powermax.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerscale.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powerscale.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/karavi-metrics-powerscale.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/karavi-metrics-powerscale.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/karavi-otel-collector.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/karavi-otel-collector.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/karavi-otel-collector.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/karavi-otel-collector.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/karavi-topology.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/karavi-topology.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/karavi-topology.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/karavi-topology.yaml diff --git a/operatorconfig/moduleconfig/observability/v1.6.0/selfsigned-cert.yaml b/operatorconfig/moduleconfig/observability/v1.9.0/selfsigned-cert.yaml similarity index 100% rename from operatorconfig/moduleconfig/observability/v1.6.0/selfsigned-cert.yaml rename to operatorconfig/moduleconfig/observability/v1.9.0/selfsigned-cert.yaml diff --git a/operatorconfig/moduleconfig/replication/v1.6.0/container.yaml b/operatorconfig/moduleconfig/replication/v1.9.0/container.yaml similarity index 94% rename from operatorconfig/moduleconfig/replication/v1.6.0/container.yaml rename to operatorconfig/moduleconfig/replication/v1.9.0/container.yaml index c991373bc..4812546b2 100644 --- a/operatorconfig/moduleconfig/replication/v1.6.0/container.yaml +++ b/operatorconfig/moduleconfig/replication/v1.9.0/container.yaml @@ -1,5 +1,5 @@ name: dell-csi-replicator -image: dellemc/dell-csi-replicator:v1.6.0 +image: dellemc/dell-csi-replicator:v1.9.0 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/moduleconfig/replication/v1.6.0/controller.yaml b/operatorconfig/moduleconfig/replication/v1.9.0/controller.yaml similarity index 100% rename from operatorconfig/moduleconfig/replication/v1.6.0/controller.yaml rename to operatorconfig/moduleconfig/replication/v1.9.0/controller.yaml diff --git a/operatorconfig/moduleconfig/replication/v1.6.0/replicationcrds.all.yaml b/operatorconfig/moduleconfig/replication/v1.9.0/replicationcrds.all.yaml similarity index 100% rename from operatorconfig/moduleconfig/replication/v1.6.0/replicationcrds.all.yaml rename to operatorconfig/moduleconfig/replication/v1.9.0/replicationcrds.all.yaml diff --git a/operatorconfig/moduleconfig/replication/v1.6.0/rules.yaml b/operatorconfig/moduleconfig/replication/v1.9.0/rules.yaml similarity index 100% rename from operatorconfig/moduleconfig/replication/v1.6.0/rules.yaml rename to operatorconfig/moduleconfig/replication/v1.9.0/rules.yaml diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-controller.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-controller.yaml similarity index 97% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-controller.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-controller.yaml index a0a5d7c2a..1a2dcb872 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-controller.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-controller.yaml @@ -14,7 +14,7 @@ # # name: podmon -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent env: - name: MY_NODE_NAME diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-node.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-node.yaml similarity index 98% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-node.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-node.yaml index b76f701f0..30d70e0a8 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerflex-node.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerflex-node.yaml @@ -14,7 +14,7 @@ # # name: podmon -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent securityContext: privileged: true diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-controller.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-controller.yaml similarity index 97% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-controller.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-controller.yaml index afb9861c4..7813dc9ac 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-controller.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-controller.yaml @@ -14,7 +14,7 @@ # # name: podmon -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent env: - name: MY_NODE_NAME diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-node.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-node.yaml similarity index 98% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-node.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-node.yaml index 42cff02c2..c73f0de1b 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerscale-node.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerscale-node.yaml @@ -14,7 +14,7 @@ # # name: podmon -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent securityContext: privileged: true diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-controller.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-controller.yaml similarity index 97% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-controller.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-controller.yaml index 9bdbf44c8..a0d1a135a 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-controller.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-controller.yaml @@ -14,7 +14,7 @@ # # name: podmon -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent env: - name: MY_NODE_NAME diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-node.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-node.yaml similarity index 98% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-node.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-node.yaml index 2518bba6f..9bd2db03f 100644 --- a/operatorconfig/moduleconfig/resiliency/v1.7.0/container-powerstore-node.yaml +++ b/operatorconfig/moduleconfig/resiliency/v1.10.0/container-powerstore-node.yaml @@ -19,7 +19,7 @@ securityContext: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true -image: dellemc/podmon:v1.7.0 +image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent env: - name: KUBE_NODE_NAME diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/controller-roles.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/controller-roles.yaml similarity index 100% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/controller-roles.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/controller-roles.yaml diff --git a/operatorconfig/moduleconfig/resiliency/v1.7.0/node-roles.yaml b/operatorconfig/moduleconfig/resiliency/v1.10.0/node-roles.yaml similarity index 100% rename from operatorconfig/moduleconfig/resiliency/v1.7.0/node-roles.yaml rename to operatorconfig/moduleconfig/resiliency/v1.10.0/node-roles.yaml diff --git a/pkg/modules/authorization_test.go b/pkg/modules/authorization_test.go index 6402a0adb..99e256741 100644 --- a/pkg/modules/authorization_test.go +++ b/pkg/modules/authorization_test.go @@ -310,7 +310,7 @@ func TestAuthorizationPreCheck(t *testing.T) { namespace := customResource.Namespace tmpCR := customResource auth := tmpCR.Spec.Modules[0] - auth.ConfigVersion = "v1.10.0" + auth.ConfigVersion = "v1.11.0" karaviAuthconfig := getSecret(namespace, "karavi-authorization-config") proxyAuthzTokens := getSecret(namespace, "proxy-authz-tokens") @@ -453,7 +453,7 @@ func TestAuthorizationServerPreCheck(t *testing.T) { tmpCR := customResource auth := tmpCR.Spec.Modules[0] - auth.ConfigVersion = "v1.10.0" + auth.ConfigVersion = "v1.11.0" karaviConfig := getSecret(customResource.Namespace, "karavi-config-secret") karaviStorage := getSecret(customResource.Namespace, "karavi-storage-secret") karaviTLS := getSecret(customResource.Namespace, "karavi-auth-tls") @@ -682,7 +682,7 @@ func TestAuthorizationIngress(t *testing.T) { return true, true, tmpCR, sourceClient, operatorConfig }, - "success - creating v1.10.0": func(*testing.T) (bool, bool, csmv1.ContainerStorageModule, ctrlClient.Client, utils.OperatorConfig) { + "success - creating v1.11.0": func(*testing.T) (bool, bool, csmv1.ContainerStorageModule, ctrlClient.Client, utils.OperatorConfig) { customResource, err := getCustomResource("./testdata/cr_auth_proxy.yaml") if err != nil { panic(err) diff --git a/pkg/modules/testdata/cr_auth_proxy.yaml b/pkg/modules/testdata/cr_auth_proxy.yaml index c741cee03..ffd09052c 100644 --- a/pkg/modules/testdata/cr_auth_proxy.yaml +++ b/pkg/modules/testdata/cr_auth_proxy.yaml @@ -9,16 +9,16 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.10.1 - tenantService: dellemc/csm-authorization-tenant:v1.10.1 - roleService: dellemc/csm-authorization-role:v1.10.1 - storageService: dellemc/csm-authorization-storage:v1.10.1 + proxyService: dellemc/csm-authorization-proxy:v1.11.0 + tenantService: dellemc/csm-authorization-tenant:v1.11.0 + roleService: dellemc/csm-authorization-role:v1.11.0 + storageService: dellemc/csm-authorization-storage:v1.11.0 redis: redis:6.0.8-alpine commander: rediscommander/redis-commander:latest opa: openpolicyagent/opa diff --git a/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml b/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml index 348dc02d2..74a5d8a1e 100644 --- a/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml +++ b/pkg/modules/testdata/cr_auth_proxy_no_redis.yaml @@ -9,16 +9,16 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.10.1 - tenantService: dellemc/csm-authorization-tenant:v1.10.1 - roleService: dellemc/csm-authorization-role:v1.10.1 - storageService: dellemc/csm-authorization-storage:v1.10.1 + proxyService: dellemc/csm-authorization-proxy:v1.11.0 + tenantService: dellemc/csm-authorization-tenant:v1.11.0 + roleService: dellemc/csm-authorization-role:v1.11.0 + storageService: dellemc/csm-authorization-storage:v1.11.0 redis: redis:6.0.8-alpine commander: rediscommander/redis-commander:latest opa: openpolicyagent/opa diff --git a/pkg/modules/testdata/cr_powerflex_observability.yaml b/pkg/modules/testdata/cr_powerflex_observability.yaml index f86262401..8bb997673 100644 --- a/pkg/modules/testdata/cr_powerflex_observability.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability.yaml @@ -127,14 +127,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: certificate for cert/private-key pair -- please add cert here to use custom certificates # Allowed values: string certificate: "" @@ -176,7 +176,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: true # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -233,7 +233,7 @@ spec: enabled: false components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.7.0 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml index eb08478de..64be4394d 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml @@ -171,14 +171,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: certificate for cert/private-key pair -- please add cert here to use custom certificates # Allowed values: string certificate: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVCVENDQXUyZ0F3SUJBZ0lVVThsYncza09ITk5QSXppRitJb3NUT3pSZVZNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2daRXhDekFKQmdOVkJBWVRBbFZUTVJFd0R3WURWUVFJREFoT1pYY2dXVzl5YXpFUk1BOEdBMVVFQnd3SQpUbVYzSUZsdmNtc3hEVEFMQmdOVkJBb01CRVJsYkd3eEREQUtCZ05WQkFzTUEwbFRSekVZTUJZR0ExVUVBd3dQClNtOXZjMlZ3Y0drSUNBZ0lDQWdJTVNVd0l3WUpLb1pJaHZjTkFRa0JGaFpxYjI5elpYQndhVjlzZFc1aFFHUmwKYkd3dVkyOXRNQjRYRFRJME1ESXlNVEU0TWpRME1sb1hEVEkwTURVeU1URTRNalEwTWxvd2daRXhDekFKQmdOVgpCQVlUQWxWVE1SRXdEd1lEVlFRSURBaE9aWGNnV1c5eWF6RVJNQThHQTFVRUJ3d0lUbVYzSUZsdmNtc3hEVEFMCkJnTlZCQW9NQkVSbGJHd3hEREFLQmdOVkJBc01BMGxUUnpFWU1CWUdBMVVFQXd3UFNtOXZjMlZ3Y0drSUNBZ0kKQ0FnSU1TVXdJd1lKS29aSWh2Y05BUWtCRmhacWIyOXpaWEJ3YVY5c2RXNWhRR1JsYkd3dVkyOXRNSUlCSWpBTgpCZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF5SXhkZ04wNDdnZk41T0h3SHFhMjlHNWd3dDkzCmVidnEwZVdnZE5RWXUvUU91YktoQ3JWYUN6QXBzTGhRcnlhOEM4OWtTM3VmRHNLM3o3aHJIRXhnblc4ZzdGL1cKTjVpaXYzcU9GcDk2ZVc4VFR5UHJhVktKV3psay9xSWhWdkhGVGxTbk5jcmJTZW45RkhxZmR4RnA3ejNVSXdtVQprZk8vTTQ1RHkrcDU2cmdqOW4vSTYvVmtpMWVxalBIN1dZTnZJQXJNa0pvZTBhSFlVSTdqa3dEZ1N6ZE1jMnM3ClI5NWxQTFY1MDgxdFNCWTJtNno0VGt1dktQdG1RZ1pML3JKL2lHUTBLVTkyYmRFUC9USDVSeEkyRHZ2U3BQSzUKUkhzTEhPVDdUZWV5NGJXU1VQemJTRzBRQUE0b1JyNTV2M1VYbmlmMExwNEQ0OU5xcHRSK0VzZkx2d0lEQVFBQgpvMU13VVRBZEJnTlZIUTRFRmdRVVlZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dId1lEVlIwakJCZ3dGb0FVCllZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dEd1lEVlIwVEFRSC9CQVV3QXdFQi96QU5CZ2txaGtpRzl3MEIKQVFzRkFBT0NBUUVBS2dWUjRvQjhlb0hNWTZ2Tm9WUERJd29NU3d2eGUyWnVDN0N0bkRvRUJjUzlrQU12TURqRwpzeFN2b0o2TXlXckpNaUt4aDJmekdGcS9FVWxDcHdKUEwvNTlTYmR3cG54UUxGWjdyZkVjMS9WQ3dOUHcxM0pEClBnZmsvZnd6QVNEcS9mWm5pTmVldHpCa2dQdEdMWDFsU051OHFNSUZHczR0QlpZZS8xNnJ4VFFpMzRsUk56QVUKMlA2YTM3YjhWVU9yRUNhTTlOdUFaY3FWSjRiODhvNXBQSkRldm5Hb3JPOHRMQWhvT3kyclB5QnJKaVhNQ0ZKMAo4TzVQS1NrSlJyQ2x1enBPeEtxUURONTlmVDdYNEp6VzI3MVhqQlIzWVdJTUdha08rSnRUdEwyUDNBWXdtd2E1CnNibUV0UU5rSjNraDhneVNVL2p4WnQrVWVUVWRJYWxDV0E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t" @@ -220,7 +220,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: true # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml index 344b6b047..66c19d859 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml @@ -171,14 +171,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: certificate for cert/private-key pair -- please add cert here to use custom certificates # Allowed values: string certificate: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUVCVENDQXUyZ0F3SUJBZ0lVVThsYncza09ITk5QSXppRitJb3NUT3pSZVZNd0RRWUpLb1pJaHZjTkFRRUwKQlFBd2daRXhDekFKQmdOVkJBWVRBbFZUTVJFd0R3WURWUVFJREFoT1pYY2dXVzl5YXpFUk1BOEdBMVVFQnd3SQpUbVYzSUZsdmNtc3hEVEFMQmdOVkJBb01CRVJsYkd3eEREQUtCZ05WQkFzTUEwbFRSekVZTUJZR0ExVUVBd3dQClNtOXZjMlZ3Y0drSUNBZ0lDQWdJTVNVd0l3WUpLb1pJaHZjTkFRa0JGaFpxYjI5elpYQndhVjlzZFc1aFFHUmwKYkd3dVkyOXRNQjRYRFRJME1ESXlNVEU0TWpRME1sb1hEVEkwTURVeU1URTRNalEwTWxvd2daRXhDekFKQmdOVgpCQVlUQWxWVE1SRXdEd1lEVlFRSURBaE9aWGNnV1c5eWF6RVJNQThHQTFVRUJ3d0lUbVYzSUZsdmNtc3hEVEFMCkJnTlZCQW9NQkVSbGJHd3hEREFLQmdOVkJBc01BMGxUUnpFWU1CWUdBMVVFQXd3UFNtOXZjMlZ3Y0drSUNBZ0kKQ0FnSU1TVXdJd1lKS29aSWh2Y05BUWtCRmhacWIyOXpaWEJ3YVY5c2RXNWhRR1JsYkd3dVkyOXRNSUlCSWpBTgpCZ2txaGtpRzl3MEJBUUVGQUFPQ0FROEFNSUlCQ2dLQ0FRRUF5SXhkZ04wNDdnZk41T0h3SHFhMjlHNWd3dDkzCmVidnEwZVdnZE5RWXUvUU91YktoQ3JWYUN6QXBzTGhRcnlhOEM4OWtTM3VmRHNLM3o3aHJIRXhnblc4ZzdGL1cKTjVpaXYzcU9GcDk2ZVc4VFR5UHJhVktKV3psay9xSWhWdkhGVGxTbk5jcmJTZW45RkhxZmR4RnA3ejNVSXdtVQprZk8vTTQ1RHkrcDU2cmdqOW4vSTYvVmtpMWVxalBIN1dZTnZJQXJNa0pvZTBhSFlVSTdqa3dEZ1N6ZE1jMnM3ClI5NWxQTFY1MDgxdFNCWTJtNno0VGt1dktQdG1RZ1pML3JKL2lHUTBLVTkyYmRFUC9USDVSeEkyRHZ2U3BQSzUKUkhzTEhPVDdUZWV5NGJXU1VQemJTRzBRQUE0b1JyNTV2M1VYbmlmMExwNEQ0OU5xcHRSK0VzZkx2d0lEQVFBQgpvMU13VVRBZEJnTlZIUTRFRmdRVVlZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dId1lEVlIwakJCZ3dGb0FVCllZakFuMmdHQXVDalB3NVZINVI3amNsWElwd3dEd1lEVlIwVEFRSC9CQVV3QXdFQi96QU5CZ2txaGtpRzl3MEIKQVFzRkFBT0NBUUVBS2dWUjRvQjhlb0hNWTZ2Tm9WUERJd29NU3d2eGUyWnVDN0N0bkRvRUJjUzlrQU12TURqRwpzeFN2b0o2TXlXckpNaUt4aDJmekdGcS9FVWxDcHdKUEwvNTlTYmR3cG54UUxGWjdyZkVjMS9WQ3dOUHcxM0pEClBnZmsvZnd6QVNEcS9mWm5pTmVldHpCa2dQdEdMWDFsU051OHFNSUZHczR0QlpZZS8xNnJ4VFFpMzRsUk56QVUKMlA2YTM3YjhWVU9yRUNhTTlOdUFaY3FWSjRiODhvNXBQSkRldm5Hb3JPOHRMQWhvT3kyclB5QnJKaVhNQ0ZKMAo4TzVQS1NrSlJyQ2x1enBPeEtxUURONTlmVDdYNEp6VzI3MVhqQlIzWVdJTUdha08rSnRUdEwyUDNBWXdtd2E1CnNibUV0UU5rSjNraDhneVNVL2p4WnQrVWVUVWRJYWxDV0E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t" @@ -220,7 +220,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: true # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/pkg/modules/testdata/cr_powerflex_replica.yaml b/pkg/modules/testdata/cr_powerflex_replica.yaml index 3e3d0a950..1a9081152 100644 --- a/pkg/modules/testdata/cr_powerflex_replica.yaml +++ b/pkg/modules/testdata/cr_powerflex_replica.yaml @@ -21,14 +21,14 @@ spec: enabled: true components: - name: dell-csi-replicator - image: dellemc/dell-csi-replicator:v1.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: - name: "X_CSI_REPLICATION_PREFIX" value: "replication.storage.dell.com" - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" value: "powerflex" - name: dell-replication-controller-manager - image: dellemc/dell-replication-controller:v1.8.1 + image: dellemc/dell-replication-controller:v1.9.0 envs: - name: "TARGET_CLUSTERS_IDS" value: "test-target-cluster-1,test-target-cluster-2" diff --git a/pkg/modules/testdata/cr_powerflex_resiliency.yaml b/pkg/modules/testdata/cr_powerflex_resiliency.yaml index e1c028e67..345dd1e04 100644 --- a/pkg/modules/testdata/cr_powerflex_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerflex_resiliency.yaml @@ -24,10 +24,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -41,7 +41,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/pkg/modules/testdata/cr_powermax_observability.yaml b/pkg/modules/testdata/cr_powermax_observability.yaml index b4ec2de7e..fa87ef59c 100644 --- a/pkg/modules/testdata/cr_powermax_observability.yaml +++ b/pkg/modules/testdata/cr_powermax_observability.yaml @@ -17,14 +17,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -47,7 +47,7 @@ spec: # enabled: Enable/Disable PowerMax metrics enabled: true # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.3.1 + image: dellemc/csm-metrics-powermax:v1.4.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int @@ -97,7 +97,7 @@ spec: enabled: false components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powermax_replica.yaml b/pkg/modules/testdata/cr_powermax_replica.yaml index 87c59c885..57b77fd3f 100644 --- a/pkg/modules/testdata/cr_powermax_replica.yaml +++ b/pkg/modules/testdata/cr_powermax_replica.yaml @@ -29,14 +29,14 @@ spec: enabled: true components: - name: dell-csi-replicator - image: dellemc/dell-csi-replicator:v1.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: - name: "X_CSI_REPLICATION_PREFIX" value: "replication.storage.dell.com/" - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" value: "powermax/" - name: dell-replication-controller-manager - image: dellemc/dell-replication-controller:v1.8.1 + image: dellemc/dell-replication-controller:v1.9.0 envs: - name: "TARGET_CLUSTERS_IDS" value: "test-target-cluster-1,test-target-cluster-2" diff --git a/pkg/modules/testdata/cr_powermax_reverseproxy.yaml b/pkg/modules/testdata/cr_powermax_reverseproxy.yaml index 7796786fc..47ffbf168 100644 --- a/pkg/modules/testdata/cr_powermax_reverseproxy.yaml +++ b/pkg/modules/testdata/cr_powermax_reverseproxy.yaml @@ -29,13 +29,12 @@ spec: - name: "csireverseproxy" # enabled: Always set to true enabled: true - configVersion: v2.9.1 + configVersion: v2.10.0 components: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -52,7 +51,7 @@ spec: enabled: false components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powerscale_auth.yaml b/pkg/modules/testdata/cr_powerscale_auth.yaml index b8f3758a8..509378d89 100644 --- a/pkg/modules/testdata/cr_powerscale_auth.yaml +++ b/pkg/modules/testdata/cr_powerscale_auth.yaml @@ -18,7 +18,7 @@ spec: enabled: true components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml b/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml index 63db4c92c..ab59d4635 100644 --- a/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml +++ b/pkg/modules/testdata/cr_powerscale_auth_validate_cert.yaml @@ -18,7 +18,7 @@ spec: enabled: true components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powerscale_observability.yaml b/pkg/modules/testdata/cr_powerscale_observability.yaml index 638a828c8..9a7cb8af9 100644 --- a/pkg/modules/testdata/cr_powerscale_observability.yaml +++ b/pkg/modules/testdata/cr_powerscale_observability.yaml @@ -17,14 +17,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -48,7 +48,7 @@ spec: enabled: true # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -114,7 +114,7 @@ spec: enabled: false components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/pkg/modules/testdata/cr_powerscale_replica.yaml b/pkg/modules/testdata/cr_powerscale_replica.yaml index d433fc60b..6fc3e2f7a 100644 --- a/pkg/modules/testdata/cr_powerscale_replica.yaml +++ b/pkg/modules/testdata/cr_powerscale_replica.yaml @@ -17,14 +17,14 @@ spec: enabled: true components: - name: dell-csi-replicator - image: dellemc/dell-csi-replicator:v1.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: - name: "X_CSI_REPLICATION_PREFIX" value: "replication.storage.dell.com" - name: "X_CSI_REPLICATION_CONTEXT_PREFIX" value: "powerscale" - name: dell-replication-controller-manager - image: dellemc/dell-replication-controller:v1.8.1 + image: dellemc/dell-replication-controller:v1.9.0 envs: - name: "TARGET_CLUSTERS_IDS" value: "test-target-cluster-1,test-target-cluster-2" diff --git a/pkg/modules/testdata/cr_powerscale_resiliency.yaml b/pkg/modules/testdata/cr_powerscale_resiliency.yaml index 54589bd4a..94f025a49 100644 --- a/pkg/modules/testdata/cr_powerscale_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerscale_resiliency.yaml @@ -20,10 +20,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -38,7 +38,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.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/pkg/modules/testdata/cr_powerstore_resiliency.yaml b/pkg/modules/testdata/cr_powerstore_resiliency.yaml index 4067f0687..ca2266e93 100644 --- a/pkg/modules/testdata/cr_powerstore_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerstore_resiliency.yaml @@ -14,7 +14,7 @@ spec: imagePullPolicy: IfNotPresent modules: - name: resiliency - configVersion: "v1.9.1" + configVersion: "v1.10.0" enabled: true components: - name: podmon-controller diff --git a/samples/authorization/certificate_v180.yaml b/samples/authorization/certificate_v1110.yaml similarity index 100% rename from samples/authorization/certificate_v180.yaml rename to samples/authorization/certificate_v1110.yaml diff --git a/samples/authorization/csm_authorization_proxy_server_v180.yaml b/samples/authorization/csm_authorization_proxy_server_v1110.yaml similarity index 68% rename from samples/authorization/csm_authorization_proxy_server_v180.yaml rename to samples/authorization/csm_authorization_proxy_server_v1110.yaml index 8cfd24450..122b07d99 100644 --- a/samples/authorization/csm_authorization_proxy_server_v180.yaml +++ b/samples/authorization/csm_authorization_proxy_server_v1110.yaml @@ -9,25 +9,24 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.8.0 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.8.0 - tenantService: dellemc/csm-authorization-tenant:v1.8.0 - roleService: dellemc/csm-authorization-role:v1.8.0 - storageService: dellemc/csm-authorization-storage:v1.8.0 + proxyService: dellemc/csm-authorization-proxy:v1.11.0 + tenantService: dellemc/csm-authorization-tenant:v1.11.0 + roleService: dellemc/csm-authorization-role:v1.11.0 + storageService: dellemc/csm-authorization-storage:v1.11.0 redis: redis:6.0.8-alpine commander: rediscommander/redis-commander:latest opa: openpolicyagent/opa opaKubeMgmt: openpolicyagent/kube-mgmt:0.11 envs: - # base hostname for the ingress rules that expose the services - # the proxy-server ingress will use this hostname - # Allowed values: string - # Default value: csm-authorization.com + # proxy-server ingress will use this hostname + # NOTE: an additional hostname can be configured in the PROXY_INGRESS_HOST environment variable + # NOTE: proxy-server ingress is configured to accept IP address connections so hostnames are not required - name: "PROXY_HOST" value: "csm-authorization.com" @@ -40,7 +39,9 @@ spec: - name: "PROXY_INGRESS_HOST" value: "authorization-ingress-nginx-controller.authorization.svc.cluster.local" - # Specify storage class for redis. Otherwise, default storage class is used. + # by default, csm-authorization will deploy a local (https://kubernetes.io/docs/concepts/storage/storage-classes/#local) volume for redis + # to use a different storage class for redis, specify the name of the storage class + # NOTE: the storage class must NOT be a storage class provisioned by a CSI driver using this installation of CSM Authorization # Default value: None - name: "REDIS_STORAGE_CLASS" value: "" diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 804a54928..8e065cb46 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -183,10 +183,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -198,14 +198,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -251,7 +251,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -312,13 +312,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -332,7 +332,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -365,10 +365,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -382,7 +382,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index 2c163b3ad..64b90f6e2 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -241,13 +241,12 @@ spec: # enabled: Always set to true enabled: true forceRemoveModule: true - configVersion: v2.9.1 + configVersion: v2.10.0 components: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -263,10 +262,10 @@ spec: - name: authorization # enabled: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -283,13 +282,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -304,7 +303,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -334,14 +333,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -387,7 +386,7 @@ spec: # enabled: Enable/Disable PowerMax metrics enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.3.1 + image: dellemc/csm-metrics-powermax:v1.4.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml index 494df1280..56b3170c0 100644 --- a/samples/storage_csm_powerscale_v2110.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -251,10 +251,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -271,13 +271,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -292,7 +292,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -322,14 +322,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -376,7 +376,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -445,10 +445,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-isilon" @@ -463,7 +463,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.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/samples/storage_csm_powerstore_v2110.yaml b/samples/storage_csm_powerstore_v2110.yaml index 92a188cc9..a293332e1 100644 --- a/samples/storage_csm_powerstore_v2110.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -176,10 +176,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller - image: dellemc/podmon:v1.9.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-powerstore" @@ -194,7 +194,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.1 + image: dellemc/podmon:v1.10.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/tests/config/driverconfig/unity/v2.10.0/controller.yaml b/tests/config/driverconfig/unity/v2.10.0/controller.yaml index 15a427036..71c75df44 100644 --- a/tests/config/driverconfig/unity/v2.10.0/controller.yaml +++ b/tests/config/driverconfig/unity/v2.10.0/controller.yaml @@ -211,7 +211,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-unity:v2.9.1 + image: dellemc/csi-unity:v2.10.0 args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" diff --git a/tests/config/driverconfig/unity/v2.10.1/controller.yaml b/tests/config/driverconfig/unity/v2.10.1/controller.yaml index 15a427036..463fe2381 100644 --- a/tests/config/driverconfig/unity/v2.10.1/controller.yaml +++ b/tests/config/driverconfig/unity/v2.10.1/controller.yaml @@ -211,7 +211,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-unity:v2.9.1 + image: dellemc/csi-unity:v2.10.1 args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" diff --git a/tests/config/driverconfig/unity/v2.11.0/controller.yaml b/tests/config/driverconfig/unity/v2.11.0/controller.yaml index 15a427036..ff6bd62bc 100644 --- a/tests/config/driverconfig/unity/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/controller.yaml @@ -211,7 +211,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-unity:v2.9.1 + image: dellemc/csi-unity:v2.11.0 args: - "--driver-name=csi-unity.dellemc.com" - "--driver-config=/unity-config/driver-config-params.yaml" diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml index 4c6614bb5..425fd1516 100644 --- a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml +++ b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server.yaml @@ -9,7 +9,7 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_alt_ns.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_alt_ns.yaml index 4cc6af321..753e51995 100644 --- a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_alt_ns.yaml +++ b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_alt_ns.yaml @@ -9,7 +9,7 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.9.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_default_redis.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_default_redis.yaml index 4a6c3fe68..b4325da44 100644 --- a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_default_redis.yaml +++ b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_default_redis.yaml @@ -9,7 +9,7 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_n_minus_1.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_n_minus_1.yaml index df56e44ed..196a3742f 100644 --- a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_n_minus_1.yaml +++ b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_n_minus_1.yaml @@ -9,16 +9,16 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.9.1 + configVersion: v1.10.1 forceRemoveModule: true components: - name: karavi-authorization-proxy-server # enable: Enable/Disable csm-authorization proxy server enabled: true - proxyService: dellemc/csm-authorization-proxy:v1.9.1 - tenantService: dellemc/csm-authorization-tenant:v1.9.1 - roleService: dellemc/csm-authorization-role:v1.9.1 - storageService: dellemc/csm-authorization-storage:v1.9.1 + proxyService: dellemc/csm-authorization-proxy:v1.10.1 + tenantService: dellemc/csm-authorization-tenant:v1.10.1 + roleService: dellemc/csm-authorization-role:v1.10.1 + storageService: dellemc/csm-authorization-storage:v1.10.1 redis: redis:6.0.8-alpine commander: rediscommander/redis-commander:latest opa: openpolicyagent/opa diff --git a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_no_cert.yaml b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_no_cert.yaml index 4c6614bb5..425fd1516 100644 --- a/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_no_cert.yaml +++ b/tests/e2e/testfiles/authorization-templates/csm_authorization_proxy_server_no_cert.yaml @@ -9,7 +9,7 @@ spec: - name: authorization-proxy-server # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 forceRemoveModule: true components: - name: karavi-authorization-proxy-server diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml index 95b04c28c..a950437eb 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex.yaml @@ -167,7 +167,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -182,7 +182,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology @@ -273,13 +273,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -293,7 +293,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -330,7 +330,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml index 4fdbd9a58..45ac1ff90 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml @@ -156,10 +156,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -171,14 +171,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -201,7 +201,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml index 1f5990a38..3ff1d2b9f 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml @@ -155,10 +155,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -170,14 +170,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -200,7 +200,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml index e9dd0a353..76bd885f1 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml @@ -155,10 +155,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -170,14 +170,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -200,7 +200,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml index 9c9d55128..28dabc650 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml @@ -156,10 +156,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -171,14 +171,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -201,7 +201,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml index 5cb53ebdb..f3439c552 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml @@ -129,7 +129,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml index 39808ab67..1390294a9 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml @@ -137,10 +137,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.9.1 + configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.9.1 + image: dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml index 0fb3bff64..c3fc40739 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml @@ -137,10 +137,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.9.1 + configVersion: v1.10.1 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.9.1 + image: dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml index eaff8929a..52f065bde 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml @@ -209,14 +209,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.6.0 + configVersion: v1.7.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.6.0 + image: dellemc/csm-topology:v1.7.0 # certificate: base64-encoded certificate for cert/private-key pair -- add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -265,7 +265,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.6.0 + image: dellemc/csm-metrics-powerflex:v1.7.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int @@ -327,13 +327,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.6.0 + configVersion: v1.7.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.6.0 + image: dellemc/dell-csi-replicator:v1.7.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -348,7 +348,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.6.0 + image: dellemc/dell-replication-controller:v1.7.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 @@ -383,10 +383,10 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.7.0 + configVersion: v1.8.0 components: - name: podmon-controller - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.8.0 imagePullPolicy: IfNotPresent args: - "--labelvalue=csi-vxflexos" @@ -400,7 +400,7 @@ spec: - "--mode=controller" - "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" - name: podmon-node - image: dellemc/podmon:v1.7.0 + image: dellemc/podmon:v1.8.0 imagePullPolicy: IfNotPresent envs: # podmonAPIPort: Defines the port to be used within the kubernetes cluster diff --git a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml index dcc11298a..f527c9639 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml @@ -156,10 +156,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -171,14 +171,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -201,7 +201,7 @@ spec: # enabled: Enable/Disable PowerFlex metrics enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powerflex:v1.8.1 + image: dellemc/csm-metrics-powerflex:v1.9.0 envs: # POWERFLEX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerFlex # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml index 947050591..7bdfb0306 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml @@ -129,7 +129,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml index efa135eed..395116fb1 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml @@ -129,7 +129,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -144,7 +144,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml index f8d1549d7..54b776d58 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml @@ -129,7 +129,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml index e0f2bc973..1445e3b32 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml @@ -129,7 +129,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology diff --git a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml index 8a724f205..1ffa0c005 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml @@ -154,13 +154,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: true - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -175,7 +175,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 diff --git a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml index 8209fb605..47092e70b 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml @@ -179,7 +179,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: true - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powermax.yaml b/tests/e2e/testfiles/storage_csm_powermax.yaml index cb305b9f6..63592381f 100644 --- a/tests/e2e/testfiles/storage_csm_powermax.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax.yaml @@ -176,14 +176,13 @@ spec: - name: csireverseproxy # enabled: Always set to true enabled: true - configVersion: v2.9.1 + configVersion: v2.10.0 forceRemoveModule: true components: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml index f243eb54b..06dbb9a89 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml @@ -176,14 +176,13 @@ spec: - name: csireverseproxy # enabled: Always set to true enabled: true - configVersion: v2.9.1 + configVersion: v2.10.0 forceRemoveModule: true components: - name: csipowermax-reverseproxy # image: Define the container images used for the reverse proxy # Default value: None - # Example: "csipowermax-reverseproxy:v2.9.1" - image: dellemc/csipowermax-reverseproxy:v2.9.1 + image: dellemc/csipowermax-reverseproxy:v2.10.0 envs: # "tlsSecret" defines the TLS secret that is created with certificate # and its associated key @@ -199,14 +198,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: certificate for cert/private-key pair -- please add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -252,7 +251,7 @@ spec: # enabled: Enable/Disable PowerMax metrics enabled: true # image: Defines PowerMax metrics image. This shouldn't be changed - image: dellemc/csm-metrics-powermax:v1.3.1 + image: dellemc/csm-metrics-powermax:v1.4.0 envs: # POWERMAX_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerMax # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale.yaml b/tests/e2e/testfiles/storage_csm_powerscale.yaml index 3c013c0e4..e1172fd30 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale.yaml @@ -229,7 +229,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -249,13 +249,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -270,7 +270,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -304,14 +304,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -335,7 +335,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -404,7 +404,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml index d7ef64e67..fe04e2d25 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_1.yaml @@ -237,10 +237,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -257,13 +257,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -278,7 +278,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -312,14 +312,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -343,7 +343,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml index 3afa80cb8..189e086bc 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_2.yaml @@ -221,10 +221,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -241,13 +241,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -262,7 +262,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -296,14 +296,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -327,7 +327,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml index a26a6502c..ac06f423f 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_alt_vals_3.yaml @@ -221,10 +221,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -241,13 +241,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -262,7 +262,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -296,14 +296,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -327,7 +327,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml index 9cf78ee35..99a1154c7 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml @@ -221,7 +221,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml index fb32b5f84..d791beb77 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_health_monitor.yaml @@ -222,10 +222,10 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy - image: dellemc/csm-authorization-sidecar:v1.10.1 + image: dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server - name: "PROXY_HOST" @@ -242,13 +242,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -263,7 +263,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -297,14 +297,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -328,7 +328,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml index 70907c256..168efdebb 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability.yaml @@ -245,7 +245,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -267,13 +267,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -326,7 +326,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology @@ -452,7 +452,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml index be37f184c..3264f4e9a 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_auth.yaml @@ -217,7 +217,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: true - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -232,14 +232,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: true # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 # certificate: certificate for cert/private-key pair -- please add cert here to use custom certificates # for self-signed certs, leave empty string # Allowed values: string @@ -286,7 +286,7 @@ spec: enabled: true # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int diff --git a/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml index 2193d0276..04b344e4a 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_observability_top_custom_cert.yaml @@ -245,7 +245,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -267,13 +267,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: false - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -326,7 +326,7 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: true - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology @@ -452,7 +452,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml b/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml index 3e352b4f8..212b745d9 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_replica.yaml @@ -222,7 +222,7 @@ spec: - name: authorization # enable: Enable/Disable csm-authorization enabled: false - configVersion: v1.10.1 + configVersion: v1.11.0 components: - name: karavi-authorization-proxy image: dellemc/csm-authorization-sidecar:nightly @@ -242,13 +242,13 @@ spec: # false: disable replication feature(do not install dell-csi-replicator sidecar) # Default value: false enabled: true - configVersion: v1.8.1 + configVersion: v1.9.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.8.1 + image: dellemc/dell-csi-replicator:v1.9.0 envs: # replicationPrefix: prefix to prepend to storage classes parameters # Allowed values: string @@ -263,7 +263,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.8.1 + image: dellemc/dell-replication-controller:v1.9.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 @@ -297,14 +297,14 @@ spec: - name: observability # enabled: Enable/Disable observability enabled: false - configVersion: v1.8.1 + configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-topology:v1.8.1 + image: dellemc/csm-topology:v1.9.0 envs: # topology log level # Valid values: TRACE, DEBUG, INFO, WARN, ERROR, FATAL, PANIC @@ -328,7 +328,7 @@ spec: enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string - image: dellemc/csm-metrics-powerscale:v1.5.1 + image: dellemc/csm-metrics-powerscale:v1.6.0 envs: # POWERSCALE_MAX_CONCURRENT_QUERIES: set the default max concurrent queries to PowerScale # Allowed values: int @@ -397,7 +397,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml index 5a2cef69a..4fa69e8fe 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_resiliency.yaml @@ -259,7 +259,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: true - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerstore.yaml b/tests/e2e/testfiles/storage_csm_powerstore.yaml index ff0f5bda4..406843361 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore.yaml @@ -148,7 +148,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: false - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml index e68045e2c..b47d89d9e 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml @@ -148,7 +148,7 @@ spec: # false: disable Resiliency feature(do not deploy podmon sidecar) # Default value: false enabled: true - configVersion: v1.9.1 + configVersion: v1.10.0 components: - name: podmon-controller image: dellemc/podmon:nightly diff --git a/tests/shared/common.go b/tests/shared/common.go index 788e47bb0..fb616edf5 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -39,7 +39,7 @@ const ( UnityConfigVersion string = "v2.11.0" PScaleConfigVersion string = "v2.11.0" PmaxConfigVersion string = "v2.11.0" - AuthServerConfigVersion string = "v1.10.0" + AuthServerConfigVersion string = "v1.11.0" AccConfigVersion string = "v1.0.0" ) From 1eac5c14d09134e99abdb266b190732efe06aa10 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 15:18:21 +0530 Subject: [PATCH 04/15] update sidecars --- ...ll-csm-operator.clusterserviceversion.yaml | 84 +++++++++---------- config/manager/manager.yaml | 12 +-- ...ll-csm-operator.clusterserviceversion.yaml | 12 +-- config/samples/storage_v1_csm_powerflex.yaml | 12 +-- config/samples/storage_v1_csm_powermax.yaml | 12 +-- config/samples/storage_v1_csm_powerscale.yaml | 12 +-- config/samples/storage_v1_csm_powerstore.yaml | 12 +-- config/samples/storage_v1_csm_unity.yaml | 12 +-- deploy/operator.yaml | 12 +-- .../driverconfig/common/default.yaml | 12 +-- .../driverconfig/common/k8s-1.30-values.yaml | 30 +++++++ .../powerflex/v2.11.0/controller.yaml | 8 +- .../driverconfig/powerflex/v2.11.0/node.yaml | 2 +- .../powermax/v2.11.0/controller.yaml | 8 +- .../driverconfig/powermax/v2.11.0/node.yaml | 2 +- .../powerscale/v2.11.0/controller.yaml | 10 +-- .../driverconfig/powerscale/v2.11.0/node.yaml | 2 +- .../powerstore/v2.11.0/controller.yaml | 8 +- .../driverconfig/powerstore/v2.11.0/node.yaml | 2 +- .../unity/v2.11.0/controller.yaml | 8 +- .../driverconfig/unity/v2.11.0/node.yaml | 2 +- samples/storage_csm_powerflex_v2110.yaml | 12 +-- samples/storage_csm_powermax_v2110.yaml | 12 +-- samples/storage_csm_powerscale_v2110.yaml | 12 +-- samples/storage_csm_powerstore_v2110.yaml | 12 +-- samples/storage_csm_unity_v2110.yaml | 12 +-- .../powerflex/v2.11.0/controller.yaml | 8 +- .../driverconfig/powerflex/v2.11.0/node.yaml | 2 +- .../powermax/v2.11.0/controller.yaml | 8 +- .../driverconfig/powermax/v2.11.0/node.yaml | 2 +- .../powerscale/v2.11.0/controller.yaml | 8 +- .../driverconfig/powerscale/v2.11.0/node.yaml | 2 +- .../powerstore/v2.11.0/controller.yaml | 8 +- .../driverconfig/powerstore/v2.11.0/node.yaml | 2 +- .../unity/v2.11.0/controller.yaml | 8 +- .../driverconfig/unity/v2.11.0/node.yaml | 2 +- 36 files changed, 207 insertions(+), 177 deletions(-) create mode 100644 operatorconfig/driverconfig/common/k8s-1.30-values.yaml diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 1190cb958..e10c4e924 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -170,27 +170,27 @@ metadata: "args": [ "--volume-name-prefix=csipscale" ], - "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0", + "image": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "name": "provisioner" }, { - "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0", + "image": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "name": "attacher" }, { - "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0", + "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1", "name": "registrar" }, { - "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0", + "image": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", "name": "resizer" }, { - "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1", + "image": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", "name": "snapshotter" }, { - "image": "dellemc/csi-metadata-retriever:v1.7.3", + "image": "dellemc/csi-metadata-retriever:v1.8.0", "name": "csi-metadata-retriever" }, { @@ -536,27 +536,27 @@ metadata: "args": [ "--volume-name-prefix=pmax" ], - "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0", + "image": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "name": "provisioner" }, { - "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0", + "image": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "name": "attacher" }, { - "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0", + "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1", "name": "registrar" }, { - "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0", + "image": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", "name": "resizer" }, { - "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1", + "image": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", "name": "snapshotter" }, { - "image": "dellemc/csi-metadata-retriever:v1.7.3", + "image": "dellemc/csi-metadata-retriever:v1.8.0", "name": "csi-metadata-retriever" }, { @@ -830,27 +830,27 @@ metadata: "args": [ "--volume-name-prefix=csivol" ], - "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0", + "image": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "name": "provisioner" }, { - "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0", + "image": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "name": "attacher" }, { - "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0", + "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1", "name": "registrar" }, { - "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0", + "image": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", "name": "resizer" }, { - "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1", + "image": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", "name": "snapshotter" }, { - "image": "dellemc/csi-metadata-retriever:v1.7.3", + "image": "dellemc/csi-metadata-retriever:v1.8.0", "name": "csi-metadata-retriever" }, { @@ -999,27 +999,27 @@ metadata: "args": [ "--volume-name-prefix=csivol" ], - "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0", + "image": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "name": "provisioner" }, { - "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0", + "image": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "name": "attacher" }, { - "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0", + "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1", "name": "registrar" }, { - "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0", + "image": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", "name": "resizer" }, { - "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1", + "image": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", "name": "snapshotter" }, { - "image": "dellemc/csi-metadata-retriever:v1.7.3", + "image": "dellemc/csi-metadata-retriever:v1.8.0", "name": "csi-metadata-retriever" }, { @@ -1141,27 +1141,27 @@ metadata: "args": [ "--volume-name-prefix=k8s" ], - "image": "registry.k8s.io/sig-storage/csi-provisioner:v4.0.0", + "image": "registry.k8s.io/sig-storage/csi-provisioner:v5.0.1", "name": "provisioner" }, { - "image": "registry.k8s.io/sig-storage/csi-attacher:v4.5.0", + "image": "registry.k8s.io/sig-storage/csi-attacher:v4.6.1", "name": "attacher" }, { - "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0", + "image": "registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1", "name": "registrar" }, { - "image": "registry.k8s.io/sig-storage/csi-resizer:v1.10.0", + "image": "registry.k8s.io/sig-storage/csi-resizer:v1.11.1", "name": "resizer" }, { - "image": "registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1", + "image": "registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1", "name": "snapshotter" }, { - "image": "dellemc/csi-metadata-retriever:v1.7.3", + "image": "dellemc/csi-metadata-retriever:v1.8.0", "name": "csi-metadata-retriever" }, { @@ -3726,19 +3726,19 @@ spec: - 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 + value: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 - name: RELATED_IMAGE_provisioner - value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + value: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 - name: RELATED_IMAGE_snapshotter - value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + value: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: RELATED_IMAGE_registrar - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: RELATED_IMAGE_resizer - value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + value: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - 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 + value: dellemc/csi-metadata-retriever:v1.8.0 - name: RELATED_IMAGE_dell-connectivity-client value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 - name: RELATED_IMAGE_cert-persister @@ -3840,19 +3840,19 @@ spec: name: podmon-node - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: kube-rbac-proxy - - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + - image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 name: attacher - - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + - image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 name: provisioner - - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + - image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 name: snapshotter - - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 name: registrar - - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + - image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 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.3 + - image: dellemc/csi-metadata-retriever:v1.8.0 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 index 0bc5c4fe1..a3b6941a9 100644 --- a/config/manager/manager.yaml +++ b/config/manager/manager.yaml @@ -65,19 +65,19 @@ spec: name: RELATED_IMAGE_podmon-node - value: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: RELATED_IMAGE_kube-rbac-proxy - - value: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + - value: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 name: RELATED_IMAGE_attacher - - value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + - value: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 name: RELATED_IMAGE_provisioner - - value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + - value: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 name: RELATED_IMAGE_snapshotter - - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 name: RELATED_IMAGE_registrar - - value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + - value: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 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.3 + - value: dellemc/csi-metadata-retriever:v1.8.0 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/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index 0b78d3697..c02cd0ca5 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -1275,19 +1275,19 @@ spec: name: podmon-node - image: gcr.io/kubebuilder/kube-rbac-proxy:v0.8.0 name: kube-rbac-proxy - - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + - image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 name: attacher - - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + - image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 name: provisioner - - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + - image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 name: snapshotter - - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 name: registrar - - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + - image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 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.3 + - image: dellemc/csi-metadata-retriever:v1.8.0 name: metadataretriever - image: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 name: dell-connectivity-client diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 8e065cb46..ac208cfbd 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -43,18 +43,18 @@ spec: sideCars: # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=k8s"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: dellemc/csi-metadata-retriever:v1.8.0 # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index 97a22fa3e..809bf3c83 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/config/samples/storage_v1_csm_powermax.yaml @@ -213,18 +213,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:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=pmax"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/config/samples/storage_v1_csm_powerscale.yaml b/config/samples/storage_v1_csm_powerscale.yaml index 56b3170c0..ac7ca6526 100644 --- a/config/samples/storage_v1_csm_powerscale.yaml +++ b/config/samples/storage_v1_csm_powerscale.yaml @@ -224,18 +224,18 @@ spec: # effect: "NoSchedule" sideCars: - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csipscale"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/config/samples/storage_v1_csm_powerstore.yaml b/config/samples/storage_v1_csm_powerstore.yaml index a293332e1..27b99aece 100644 --- a/config/samples/storage_v1_csm_powerstore.yaml +++ b/config/samples/storage_v1_csm_powerstore.yaml @@ -59,18 +59,18 @@ spec: sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csivol"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/config/samples/storage_v1_csm_unity.yaml b/config/samples/storage_v1_csm_unity.yaml index 03f76ba93..b7b08c7f8 100644 --- a/config/samples/storage_v1_csm_unity.yaml +++ b/config/samples/storage_v1_csm_unity.yaml @@ -84,18 +84,18 @@ spec: sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csivol"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.2 + 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 # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 17b12bb01..dfe4bbb87 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1295,19 +1295,19 @@ spec: - 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 + value: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 - name: RELATED_IMAGE_provisioner - value: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + value: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 - name: RELATED_IMAGE_snapshotter - value: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + value: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: RELATED_IMAGE_registrar - value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + value: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: RELATED_IMAGE_resizer - value: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + value: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - 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 + value: dellemc/csi-metadata-retriever:v1.8.0 - name: RELATED_IMAGE_dell-connectivity-client value: docker.io/dellemc/connectivity-client-docker-k8s:1.2.3 - name: RELATED_IMAGE_cert-persister diff --git a/operatorconfig/driverconfig/common/default.yaml b/operatorconfig/driverconfig/common/default.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/default.yaml +++ b/operatorconfig/driverconfig/common/default.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.30-values.yaml b/operatorconfig/driverconfig/common/k8s-1.30-values.yaml new file mode 100644 index 000000000..db4d7f483 --- /dev/null +++ b/operatorconfig/driverconfig/common/k8s-1.30-values.yaml @@ -0,0 +1,30 @@ +# IT IS RECOMMENDED YOU DO NOT CHANGE THE IMAGES TO BE DOWNLOADED. +images: + # "images.attacher" defines the container images used for the csi attacher + # container. + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 + + # "images.provisioner" defines the container images used for the csi provisioner + # container. + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + + # "images.snapshotter" defines the container image used for the csi snapshotter + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 + + # "images.registrar" defines the container images used for the csi registrar + # container. + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 + + # "images.resizer" defines the container images used for the csi resizer + # container. + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 + + # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller + # container. + externalhealthmonitorcontroller: registry.k8s.io/sig-storage/csi-external-health-monitor-controller:v0.11.0 + + # "images.sdcmonitor" defines the container images used to monitor sdc container + sdcmonitor: dellemc/sdc:4.5.1 + + #"images.metadataretriever" defines the container images used for csi metadata retriever + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml index 0443ace2e..72b266398 100644 --- a/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/controller.yaml @@ -121,7 +121,7 @@ spec: serviceAccountName: -controller containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -134,7 +134,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -181,7 +181,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -195,7 +195,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml index 0e7b792a9..bed8a6884 100644 --- a/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/node.yaml @@ -137,7 +137,7 @@ spec: mountPath: /certs readOnly: true - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml index 075d6bd70..6564fb6cf 100644 --- a/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/controller.yaml @@ -138,7 +138,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -152,7 +152,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -184,7 +184,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -215,7 +215,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml index 48dcc2add..310fb19cb 100644 --- a/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/node.yaml @@ -196,7 +196,7 @@ spec: - name: node-topology-config mountPath: /node-topology-config - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml index 5b5c93373..efde04ecb 100644 --- a/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/controller.yaml @@ -129,7 +129,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -146,7 +146,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -183,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -216,7 +216,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -234,7 +234,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.2 + image: dellemc/csi-metadata-retriever:v1.8.0 imagePullPolicy: Always args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml index bf97a720f..d4a62c70b 100644 --- a/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/node.yaml @@ -146,7 +146,7 @@ spec: - name: csi-isilon-config-params mountPath: /csi-isilon-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml index 82524186c..300e0c6a2 100644 --- a/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/controller.yaml @@ -133,7 +133,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -149,7 +149,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -162,7 +162,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -191,7 +191,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml index b1a94469b..f675fe50c 100644 --- a/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/node.yaml @@ -163,7 +163,7 @@ spec: - name: powerstore-config-params mountPath: /powerstore-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml b/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml index 6f575e267..bf48941ba 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/controller.yaml @@ -122,7 +122,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -135,7 +135,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -167,7 +167,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -183,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/operatorconfig/driverconfig/unity/v2.11.0/node.yaml b/operatorconfig/driverconfig/unity/v2.11.0/node.yaml index 35e7088e9..f914f5f96 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/node.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/node.yaml @@ -132,7 +132,7 @@ spec: - name: unity-secret mountPath: /unity-secret - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 8e065cb46..ac208cfbd 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -43,18 +43,18 @@ spec: sideCars: # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=k8s"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + image: dellemc/csi-metadata-retriever:v1.8.0 # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index 64b90f6e2..2c00e2f3a 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -213,18 +213,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:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=pmax"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml index 56b3170c0..ac7ca6526 100644 --- a/samples/storage_csm_powerscale_v2110.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -224,18 +224,18 @@ spec: # effect: "NoSchedule" sideCars: - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csipscale"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/samples/storage_csm_powerstore_v2110.yaml b/samples/storage_csm_powerstore_v2110.yaml index a293332e1..27b99aece 100644 --- a/samples/storage_csm_powerstore_v2110.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -59,18 +59,18 @@ spec: sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csivol"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.3 + 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: false diff --git a/samples/storage_csm_unity_v2110.yaml b/samples/storage_csm_unity_v2110.yaml index 02974284d..d5a80dce0 100644 --- a/samples/storage_csm_unity_v2110.yaml +++ b/samples/storage_csm_unity_v2110.yaml @@ -86,18 +86,18 @@ spec: sideCars: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 args: ["--volume-name-prefix=csivol"] - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + 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.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 - name: csi-metadata-retriever - image: dellemc/csi-metadata-retriever:v1.7.2 + 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 # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity diff --git a/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml b/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml index 155ec5e3f..db88ff28b 100644 --- a/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/powerflex/v2.11.0/controller.yaml @@ -119,7 +119,7 @@ spec: serviceAccountName: -controller containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -132,7 +132,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -179,7 +179,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -193,7 +193,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/tests/config/driverconfig/powerflex/v2.11.0/node.yaml b/tests/config/driverconfig/powerflex/v2.11.0/node.yaml index 4f781e1c1..d81287ea0 100644 --- a/tests/config/driverconfig/powerflex/v2.11.0/node.yaml +++ b/tests/config/driverconfig/powerflex/v2.11.0/node.yaml @@ -135,7 +135,7 @@ spec: mountPath: /certs readOnly: true - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/tests/config/driverconfig/powermax/v2.11.0/controller.yaml b/tests/config/driverconfig/powermax/v2.11.0/controller.yaml index cd5800763..4b92780cc 100644 --- a/tests/config/driverconfig/powermax/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/powermax/v2.11.0/controller.yaml @@ -137,7 +137,7 @@ spec: containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -151,7 +151,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -183,7 +183,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -214,7 +214,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/tests/config/driverconfig/powermax/v2.11.0/node.yaml b/tests/config/driverconfig/powermax/v2.11.0/node.yaml index 366a94bd0..903f0c6c7 100644 --- a/tests/config/driverconfig/powermax/v2.11.0/node.yaml +++ b/tests/config/driverconfig/powermax/v2.11.0/node.yaml @@ -189,7 +189,7 @@ spec: - name: node-topology-config mountPath: /node-topology-config - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml b/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml index 44ff5ed14..576e8bc62 100644 --- a/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/powerscale/v2.11.0/controller.yaml @@ -128,7 +128,7 @@ spec: containers: - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -145,7 +145,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -182,7 +182,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -215,7 +215,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/tests/config/driverconfig/powerscale/v2.11.0/node.yaml b/tests/config/driverconfig/powerscale/v2.11.0/node.yaml index acb7e4692..a3a134b05 100644 --- a/tests/config/driverconfig/powerscale/v2.11.0/node.yaml +++ b/tests/config/driverconfig/powerscale/v2.11.0/node.yaml @@ -140,7 +140,7 @@ spec: - name: csi-isilon-config-params mountPath: /csi-isilon-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml b/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml index 4325897fc..9dd73b2eb 100644 --- a/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/controller.yaml @@ -131,7 +131,7 @@ spec: topologyKey: kubernetes.io/hostname containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -147,7 +147,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -160,7 +160,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -189,7 +189,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/tests/config/driverconfig/powerstore/v2.11.0/node.yaml b/tests/config/driverconfig/powerstore/v2.11.0/node.yaml index 9074f5732..81d8ece97 100644 --- a/tests/config/driverconfig/powerstore/v2.11.0/node.yaml +++ b/tests/config/driverconfig/powerstore/v2.11.0/node.yaml @@ -161,7 +161,7 @@ spec: - name: powerstore-config-params mountPath: /powerstore-config-params - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.9.1 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 imagePullPolicy: IfNotPresent args: - "--v=5" diff --git a/tests/config/driverconfig/unity/v2.11.0/controller.yaml b/tests/config/driverconfig/unity/v2.11.0/controller.yaml index ff6bd62bc..b965a44ab 100644 --- a/tests/config/driverconfig/unity/v2.11.0/controller.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/controller.yaml @@ -120,7 +120,7 @@ spec: topologyKey: "kubernetes.io/hostname" containers: - name: attacher - image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -133,7 +133,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: provisioner - image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -165,7 +165,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: snapshotter - image: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + image: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" @@ -181,7 +181,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: resizer - image: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + image: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 imagePullPolicy: IfNotPresent args: - "--csi-address=$(ADDRESS)" diff --git a/tests/config/driverconfig/unity/v2.11.0/node.yaml b/tests/config/driverconfig/unity/v2.11.0/node.yaml index 7de3cced1..bccf645f9 100644 --- a/tests/config/driverconfig/unity/v2.11.0/node.yaml +++ b/tests/config/driverconfig/unity/v2.11.0/node.yaml @@ -130,7 +130,7 @@ spec: - name: unity-secret mountPath: /unity-secret - name: registrar - image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.8.0 + image: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 args: - "--v=5" - "--csi-address=$(ADDRESS)" From 45f1077e5081845aba0cf8317762e8042fb897d6 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 15:40:43 +0530 Subject: [PATCH 05/15] update config version --- tests/shared/common.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/shared/common.go b/tests/shared/common.go index fb616edf5..44e51f562 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -31,8 +31,8 @@ const ( DowngradeConfigVersion string = "v2.9.0" ConfigVersion string = "v2.9.0" UpgradeConfigVersion string = "v2.10.0" - JumpUpgradeConfigVersion string = "v2.10.0" - JumpDowngradeConfigVersion string = "v2.8.0" + JumpUpgradeConfigVersion string = "v2.11.0" + JumpDowngradeConfigVersion string = "v2.9.0" OldConfigVersion string = "v2.2.0" BadConfigVersion string = "v0" PStoreConfigVersion string = "v2.11.0" From c7b1f1f6015e53e6074c6c3ee8848ace08bc32d1 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 16:13:51 +0530 Subject: [PATCH 06/15] update test --- controllers/csm_controller_test.go | 2 +- pkg/modules/testdata/cr_powerflex_observability.yaml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index 05e5a6f68..6cd901ba2 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -1499,7 +1499,7 @@ func getReverseProxyModule() []csmv1.Module { { Name: csmv1.ReverseProxy, Enabled: true, - ConfigVersion: "v2.9.0", + ConfigVersion: "2.10.0", Components: []csmv1.ContainerTemplate{ { Name: string(csmv1.ReverseProxyServer), diff --git a/pkg/modules/testdata/cr_powerflex_observability.yaml b/pkg/modules/testdata/cr_powerflex_observability.yaml index 8bb997673..e44d29899 100644 --- a/pkg/modules/testdata/cr_powerflex_observability.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability.yaml @@ -37,7 +37,7 @@ spec: # sdc-monitor is disabled by default, due to high CPU usage - name: sdc-monitor enabled: false - image: dellemc/sdc:3.6.1 + image: dellemc/sdc:4.5.1 envs: - name: HOST_PID value: "1" @@ -116,7 +116,7 @@ spec: # operator: "Exists" # effect: "NoSchedule" initContainers: - - image: dellemc/sdc:3.6.1 + - image: dellemc/sdc:4.5.1 imagePullPolicy: IfNotPresent name: sdc envs: From a41a25ad9a82d77010fb003cf07cd43a40b90cc0 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 16:19:27 +0530 Subject: [PATCH 07/15] fix upgrade path --- .../driverconfig/powerflex/v2.11.0/upgrade-path.yaml | 3 +-- operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml | 3 +-- .../driverconfig/powerscale/v2.11.0/upgrade-path.yaml | 3 +-- .../driverconfig/powerstore/v2.11.0/upgrade-path.yaml | 3 +-- operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml | 3 +-- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml index b1ece56b6..9b0f4961e 100644 --- a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml @@ -1,3 +1,2 @@ - minUpgradePath: v2.10.0 - +minUpgradePath: v2.10.0 diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml index b1ece56b6..9b0f4961e 100644 --- a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -1,3 +1,2 @@ - minUpgradePath: v2.10.0 - +minUpgradePath: v2.10.0 diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml index b1ece56b6..9b0f4961e 100644 --- a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -1,3 +1,2 @@ - minUpgradePath: v2.10.0 - +minUpgradePath: v2.10.0 diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml index b1ece56b6..9b0f4961e 100644 --- a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -1,3 +1,2 @@ - minUpgradePath: v2.10.0 - +minUpgradePath: v2.10.0 diff --git a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml index b1ece56b6..9b0f4961e 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -1,3 +1,2 @@ - minUpgradePath: v2.10.0 - +minUpgradePath: v2.10.0 From 276cb92f8fb09679bd2b67a64bf23fbb2192f784 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 16:26:47 +0530 Subject: [PATCH 08/15] Revert "fix upgrade path" This reverts commit f79817c9d910e591edc88eb51acf56df3a9688dd. --- .../driverconfig/powerflex/v2.11.0/upgrade-path.yaml | 3 ++- operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml | 3 ++- .../driverconfig/powerscale/v2.11.0/upgrade-path.yaml | 3 ++- .../driverconfig/powerstore/v2.11.0/upgrade-path.yaml | 3 ++- operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml | 3 ++- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml index 9b0f4961e..b1ece56b6 100644 --- a/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerflex/v2.11.0/upgrade-path.yaml @@ -1,2 +1,3 @@ -minUpgradePath: v2.10.0 + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml index 9b0f4961e..b1ece56b6 100644 --- a/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powermax/v2.11.0/upgrade-path.yaml @@ -1,2 +1,3 @@ -minUpgradePath: v2.10.0 + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml index 9b0f4961e..b1ece56b6 100644 --- a/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.11.0/upgrade-path.yaml @@ -1,2 +1,3 @@ -minUpgradePath: v2.10.0 + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml index 9b0f4961e..b1ece56b6 100644 --- a/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/powerstore/v2.11.0/upgrade-path.yaml @@ -1,2 +1,3 @@ -minUpgradePath: v2.10.0 + minUpgradePath: v2.10.0 + diff --git a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml index 9b0f4961e..b1ece56b6 100644 --- a/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml +++ b/operatorconfig/driverconfig/unity/v2.11.0/upgrade-path.yaml @@ -1,2 +1,3 @@ -minUpgradePath: v2.10.0 + minUpgradePath: v2.10.0 + From 7818145722a8b09517e1948e292af63b40cd37a7 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 16:44:55 +0530 Subject: [PATCH 09/15] minor fix --- controllers/csm_controller_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index 6cd901ba2..66910c240 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -1499,7 +1499,7 @@ func getReverseProxyModule() []csmv1.Module { { Name: csmv1.ReverseProxy, Enabled: true, - ConfigVersion: "2.10.0", + ConfigVersion: "v2.10.0", Components: []csmv1.ContainerTemplate{ { Name: string(csmv1.ReverseProxyServer), From 3b6a3112b3b4147ed56fcfa63bd155cdf132cc8d Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 18:09:39 +0530 Subject: [PATCH 10/15] update config version --- tests/shared/common.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/shared/common.go b/tests/shared/common.go index 44e51f562..fe4f9609e 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -32,7 +32,7 @@ const ( ConfigVersion string = "v2.9.0" UpgradeConfigVersion string = "v2.10.0" JumpUpgradeConfigVersion string = "v2.11.0" - JumpDowngradeConfigVersion string = "v2.9.0" + JumpDowngradeConfigVersion string = "v2.10.0" OldConfigVersion string = "v2.2.0" BadConfigVersion string = "v0" PStoreConfigVersion string = "v2.11.0" From 255e29d145620a8d7a1224a60914cbd916897928 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 18:26:46 +0530 Subject: [PATCH 11/15] update config version --- pkg/modules/replication_test.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/modules/replication_test.go b/pkg/modules/replication_test.go index 6c51da3ab..b9fc5bef6 100644 --- a/pkg/modules/replication_test.go +++ b/pkg/modules/replication_test.go @@ -198,7 +198,7 @@ func TestReplicationPreCheck(t *testing.T) { tmpCR := customResource replica := tmpCR.Spec.Modules[0] - replica.ConfigVersion = "v1.6.0" + replica.ConfigVersion = "v1.9.0" cluster1ConfigSecret := getSecret(utils.ReplicationControllerNameSpace, "test-target-cluster-1") cluster2ConfigSecret := getSecret(utils.ReplicationControllerNameSpace, "test-target-cluster-2") @@ -222,7 +222,7 @@ func TestReplicationPreCheck(t *testing.T) { tmpCR := customResource replica := tmpCR.Spec.Modules[0] - replica.ConfigVersion = "v1.6.0" + replica.ConfigVersion = "v1.9.0" cluster1ConfigSecret := getSecret(utils.ReplicationControllerNameSpace, "test-target-cluster-1") cluster2ConfigSecret := getSecret(utils.ReplicationControllerNameSpace, "test-target-cluster-2") @@ -246,7 +246,7 @@ func TestReplicationPreCheck(t *testing.T) { tmpCR := customResource replica := tmpCR.Spec.Modules[0] - replica.ConfigVersion = "v1.6.0" + replica.ConfigVersion = "v1.9.0" for i, component := range tmpCR.Spec.Modules[0].Components { if component.Name == utils.ReplicationControllerManager { @@ -275,7 +275,7 @@ func TestReplicationPreCheck(t *testing.T) { tmpCR := customResource replica := tmpCR.Spec.Modules[0] - replica.ConfigVersion = "v1.6.0" + replica.ConfigVersion = "v1.9.0" sourceClient := ctrlClientFake.NewClientBuilder().WithObjects().Build() From b5b708c4c7f801ee623ae778422c46dde0353636 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 18:40:03 +0530 Subject: [PATCH 12/15] update observability config version --- pkg/modules/observability_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/modules/observability_test.go b/pkg/modules/observability_test.go index 0ad18a5c6..79c3bb92e 100644 --- a/pkg/modules/observability_test.go +++ b/pkg/modules/observability_test.go @@ -128,7 +128,7 @@ func TestObservabilityPrecheck(t *testing.T) { tmpCR := customResource observability := tmpCR.Spec.Modules[0] - observability.ConfigVersion = "v1.6.0" + observability.ConfigVersion = "v1.9.0" sourceClient := ctrlClientFake.NewClientBuilder().WithObjects(isilonCreds).Build() fakeControllerRuntimeClient := func(_ []byte) (ctrlClient.Client, error) { From df5079b72f11a0e123cde7b1ba9d14dd4b66f59a Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Tue, 18 Jun 2024 18:48:03 +0530 Subject: [PATCH 13/15] update config version --- tests/shared/common.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/shared/common.go b/tests/shared/common.go index fe4f9609e..f3a0a0a4e 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -28,8 +28,8 @@ import ( // ConfigVersions used for all unit tests const ( PFlexConfigVersion string = "v2.11.0" - DowngradeConfigVersion string = "v2.9.0" - ConfigVersion string = "v2.9.0" + DowngradeConfigVersion string = "v2.10.0" + ConfigVersion string = "v2.10.0" UpgradeConfigVersion string = "v2.10.0" JumpUpgradeConfigVersion string = "v2.11.0" JumpDowngradeConfigVersion string = "v2.10.0" From f8c62128da9e5459f9d1f0dbac4bc5d5f004d295 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Wed, 19 Jun 2024 11:50:37 +0530 Subject: [PATCH 14/15] update sidecars and ocp version --- README.md | 4 ++-- bundle.Dockerfile | 2 +- bundle/metadata/annotations.yaml | 2 +- .../driverconfig/common/k8s-1.24-values.yaml | 12 ++++++------ .../driverconfig/common/k8s-1.25-values.yaml | 12 ++++++------ .../driverconfig/common/k8s-1.26-values.yaml | 12 ++++++------ .../driverconfig/common/k8s-1.27-values.yaml | 12 ++++++------ .../driverconfig/common/k8s-1.28-values.yaml | 12 ++++++------ .../driverconfig/common/k8s-1.29-values.yaml | 12 ++++++------ 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/README.md b/README.md index 899d48864..feedea671 100644 --- a/README.md +++ b/README.md @@ -61,8 +61,8 @@ For any CSM Operator and driver issues, questions or feedback, join the [Dell Te Dell Container Storage Modules Operator has been tested and qualified with - * Upstream Kubernetes cluster v1.27, v1.28, v1.29 - * OpenShift Clusters 4.13, 4.14, 4.15 with RHEL 8.x & RHCOS worker nodes + * Upstream Kubernetes cluster v1.28, v1.29, v1.30 + * OpenShift Clusters 4.14, 4.15 with RHEL 8.x & RHCOS worker nodes ## Installation diff --git a/bundle.Dockerfile b/bundle.Dockerfile index f5268118e..0886756e5 100644 --- a/bundle.Dockerfile +++ b/bundle.Dockerfile @@ -15,7 +15,7 @@ LABEL operators.operatorframework.io.metrics.project_layout=go.kubebuilder.io/v3 # Labels for testing. LABEL operators.operatorframework.io.test.mediatype.v1=scorecard+v1 LABEL operators.operatorframework.io.test.config.v1=tests/scorecard/ -LABEL com.redhat.openshift.versions=v4.13-v4.15 +LABEL com.redhat.openshift.versions=v4.14-v4.15 LABEL com.redhat.delivery.backport=false LABEL com.redhat.delivery.operator.bundle=true diff --git a/bundle/metadata/annotations.yaml b/bundle/metadata/annotations.yaml index 2fd29fb7d..95aa2e1b7 100644 --- a/bundle/metadata/annotations.yaml +++ b/bundle/metadata/annotations.yaml @@ -15,4 +15,4 @@ annotations: operators.operatorframework.io.test.config.v1: tests/scorecard/ # Annotations to specify supported OCP versions. - com.redhat.openshift.versions: v4.13-v4.15 \ No newline at end of file + com.redhat.openshift.versions: v4.14-v4.15 \ No newline at end of file diff --git a/operatorconfig/driverconfig/common/k8s-1.24-values.yaml b/operatorconfig/driverconfig/common/k8s-1.24-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.24-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.24-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.25-values.yaml b/operatorconfig/driverconfig/common/k8s-1.25-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.25-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.25-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.26-values.yaml b/operatorconfig/driverconfig/common/k8s-1.26-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.26-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.26-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.27-values.yaml b/operatorconfig/driverconfig/common/k8s-1.27-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.27-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.27-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.28-values.yaml b/operatorconfig/driverconfig/common/k8s-1.28-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.28-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.28-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 diff --git a/operatorconfig/driverconfig/common/k8s-1.29-values.yaml b/operatorconfig/driverconfig/common/k8s-1.29-values.yaml index 12b711955..db4d7f483 100644 --- a/operatorconfig/driverconfig/common/k8s-1.29-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.29-values.yaml @@ -2,22 +2,22 @@ images: # "images.attacher" defines the container images used for the csi attacher # container. - attacher: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 + attacher: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 # "images.provisioner" defines the container images used for the csi provisioner # container. - provisioner: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + provisioner: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 # "images.snapshotter" defines the container image used for the csi snapshotter - snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v7.0.1 + snapshotter: registry.k8s.io/sig-storage/csi-snapshotter:v8.0.1 # "images.registrar" defines the container images used for the csi registrar # container. - registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.0 + registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 # "images.resizer" defines the container images used for the csi resizer # container. - resizer: registry.k8s.io/sig-storage/csi-resizer:v1.10.0 + resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 # "images.externalhealthmonitorcontroller" defines the container images used for the csi external health monitor controller # container. @@ -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.3 + metadataretriever: dellemc/csi-metadata-retriever:v1.8.0 From 70390c57217eeb1a8814b5a4ec04bba170078d93 Mon Sep 17 00:00:00 2001 From: Chiman Jain Date: Wed, 19 Jun 2024 12:05:20 +0530 Subject: [PATCH 15/15] remove unnecessary space --- operatorconfig/driverconfig/common/default.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.24-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.25-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.26-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.27-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.28-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.29-values.yaml | 2 +- operatorconfig/driverconfig/common/k8s-1.30-values.yaml | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/operatorconfig/driverconfig/common/default.yaml b/operatorconfig/driverconfig/common/default.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/default.yaml +++ b/operatorconfig/driverconfig/common/default.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.24-values.yaml b/operatorconfig/driverconfig/common/k8s-1.24-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.24-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.24-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.25-values.yaml b/operatorconfig/driverconfig/common/k8s-1.25-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.25-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.25-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.26-values.yaml b/operatorconfig/driverconfig/common/k8s-1.26-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.26-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.26-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.27-values.yaml b/operatorconfig/driverconfig/common/k8s-1.27-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.27-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.27-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.28-values.yaml b/operatorconfig/driverconfig/common/k8s-1.28-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.28-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.28-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.29-values.yaml b/operatorconfig/driverconfig/common/k8s-1.29-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.29-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.29-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1 diff --git a/operatorconfig/driverconfig/common/k8s-1.30-values.yaml b/operatorconfig/driverconfig/common/k8s-1.30-values.yaml index db4d7f483..816296439 100644 --- a/operatorconfig/driverconfig/common/k8s-1.30-values.yaml +++ b/operatorconfig/driverconfig/common/k8s-1.30-values.yaml @@ -14,7 +14,7 @@ images: # "images.registrar" defines the container images used for the csi registrar # container. registrar: registry.k8s.io/sig-storage/csi-node-driver-registrar:v2.10.1 - + # "images.resizer" defines the container images used for the csi resizer # container. resizer: registry.k8s.io/sig-storage/csi-resizer:v1.11.1