From f2cd6e457519a3ac8fcc8e5b873efb072bd52f15 Mon Sep 17 00:00:00 2001 From: Rajendra Indukuri <82365588+rajendraindukuri@users.noreply.github.com> Date: Wed, 23 Feb 2022 14:59:54 +0530 Subject: [PATCH] Sync private repo with public (#19) --- .github/workflows/actions.yaml | 2 + Dockerfile | 2 +- PROJECT | 18 + ...rator-certified.clusterserviceversion.yaml | 12 + ...ll-csi-operator.clusterserviceversion.yaml | 12 + config/rbac/role.yaml | 12 + config/samples/storage_v1_csiisilon.yaml | 8 + config/samples/storage_v1_csipowermax.yaml | 9 +- controllers/csiisilon_controller.go | 5 +- controllers/csipowermax_controller.go | 5 +- controllers/csipowerstore_controller.go | 5 +- controllers/csiunity_controller.go | 5 +- controllers/csivxflexos_controller.go | 7 +- deploy/operator.yaml | 12 + driverconfig/config.yaml | 58 +- driverconfig/isilon_v220_v121.json | 8 + driverconfig/isilon_v220_v122.json | 8 + driverconfig/isilon_v220_v123.json | 8 + ...x_v6_v119.json => powermax_v220_v121.json} | 77 ++- ...x_v6_v120.json => powermax_v220_v122.json} | 77 ++- ...x_v6_v121.json => powermax_v220_v123.json} | 77 ++- driverconfig/vxflexos_v210_v120.json | 21 - driverconfig/vxflexos_v220_v121.json | 581 ++++++++++++++++++ driverconfig/vxflexos_v220_v122.json | 581 ++++++++++++++++++ driverconfig/vxflexos_v220_v123.json | 581 ++++++++++++++++++ driverconfig/vxflexos_v5_v119.json | 540 ---------------- driverconfig/vxflexos_v5_v120.json | 540 ---------------- driverconfig/vxflexos_v5_v121.json | 540 ---------------- pkg/resources/deployment/deployment.go | 1 - pkg/resources/rbac/controllerrbac.go | 5 +- samples/isilon_v220_k8s_121.yaml | 51 ++ samples/isilon_v220_k8s_122.yaml | 51 ++ samples/isilon_v220_k8s_123.yaml | 51 ++ samples/isilon_v220_ops_48.yaml | 51 ++ samples/isilon_v220_ops_49.yaml | 51 ++ ...ermax_revproxy_standalone_with_driver.yaml | 32 +- samples/powermax_v170_k8s_119.yaml | 45 -- samples/powermax_v170_k8s_120.yaml | 45 -- samples/powermax_v170_k8s_121.yaml | 45 -- samples/powermax_v170_ops_46.yaml | 45 -- samples/powermax_v170_ops_47.yaml | 45 -- samples/powermax_v220_k8s_121.yaml | 122 ++++ samples/powermax_v220_k8s_122.yaml | 122 ++++ samples/powermax_v220_k8s_123.yaml | 122 ++++ samples/powermax_v220_ops_48.yaml | 98 +++ samples/powermax_v220_ops_49.yaml | 98 +++ samples/powerstore_v220_k8s_121.yaml | 39 ++ samples/powerstore_v220_k8s_122.yaml | 39 ++ samples/powerstore_v220_k8s_123.yaml | 39 ++ samples/powerstore_v220_ops_48.yaml | 39 ++ samples/powerstore_v220_ops_49.yaml | 39 ++ samples/unity_v220_k8s_121.yaml | 2 +- samples/unity_v220_k8s_122.yaml | 2 +- samples/unity_v220_k8s_123.yaml | 2 +- samples/unity_v220_ops_48.yaml | 2 +- samples/unity_v220_ops_49.yaml | 2 +- samples/vxflex_150_k8s_121.yaml | 38 -- samples/vxflex_150_ops_46.yaml | 38 -- samples/vxflex_150_ops_47.yaml | 38 -- samples/vxflex_v220_k8s_121.yaml | 76 +++ samples/vxflex_v220_k8s_122.yaml | 76 +++ samples/vxflex_v220_k8s_123.yaml | 76 +++ ...0_k8s_120.yaml => vxflex_v220_ops_48.yaml} | 34 +- ...0_k8s_119.yaml => vxflex_v220_ops_49.yaml} | 36 +- scripts/install.sh | 4 +- .../01-simple-deployment/in-csiisilon.yaml | 8 + .../out-clusterrole-controller.yaml | 2 + .../01-simple-deployment/out-csiisilon.yaml | 2 + .../01-simple-deployment/out-daemonset.yaml | 2 + .../01-simple-deployment/out-deployment.yaml | 2 + .../01-simple-deployment/in-csipowermax.yaml | 8 +- .../out-clusterrole-controller.yaml | 2 + .../01-simple-deployment/out-csipowermax.yaml | 6 +- .../01-simple-deployment/out-daemonset.yaml | 4 +- .../01-simple-deployment/out-deployment.yaml | 4 +- .../out-clusterrole-controller.yaml | 2 + .../out-clusterrole-controller.yaml | 1 + .../in-csidriverdeployment.yaml | 4 +- .../out-clusterrole-controller.yaml | 2 + .../01-simple-deployment/out-csivxflexos.yaml | 6 +- .../01-simple-deployment/out-daemonset.yaml | 2 +- .../01-simple-deployment/out-deployment.yaml | 2 +- 82 files changed, 3467 insertions(+), 2104 deletions(-) rename driverconfig/{powermax_v6_v119.json => powermax_v220_v121.json} (88%) rename driverconfig/{powermax_v6_v120.json => powermax_v220_v122.json} (88%) rename driverconfig/{powermax_v6_v121.json => powermax_v220_v123.json} (88%) create mode 100644 driverconfig/vxflexos_v220_v121.json create mode 100644 driverconfig/vxflexos_v220_v122.json create mode 100644 driverconfig/vxflexos_v220_v123.json delete mode 100644 driverconfig/vxflexos_v5_v119.json delete mode 100644 driverconfig/vxflexos_v5_v120.json delete mode 100644 driverconfig/vxflexos_v5_v121.json delete mode 100644 samples/powermax_v170_k8s_119.yaml delete mode 100644 samples/powermax_v170_k8s_120.yaml delete mode 100644 samples/powermax_v170_k8s_121.yaml delete mode 100644 samples/powermax_v170_ops_46.yaml delete mode 100644 samples/powermax_v170_ops_47.yaml create mode 100644 samples/powermax_v220_k8s_121.yaml create mode 100644 samples/powermax_v220_k8s_122.yaml create mode 100644 samples/powermax_v220_k8s_123.yaml create mode 100644 samples/powermax_v220_ops_48.yaml create mode 100644 samples/powermax_v220_ops_49.yaml delete mode 100644 samples/vxflex_150_k8s_121.yaml delete mode 100644 samples/vxflex_150_ops_46.yaml delete mode 100644 samples/vxflex_150_ops_47.yaml create mode 100644 samples/vxflex_v220_k8s_121.yaml create mode 100644 samples/vxflex_v220_k8s_122.yaml create mode 100644 samples/vxflex_v220_k8s_123.yaml rename samples/{vxflex_150_k8s_120.yaml => vxflex_v220_ops_48.yaml} (58%) rename samples/{vxflex_150_k8s_119.yaml => vxflex_v220_ops_49.yaml} (53%) diff --git a/.github/workflows/actions.yaml b/.github/workflows/actions.yaml index 39c5d2a..2cc04f0 100644 --- a/.github/workflows/actions.yaml +++ b/.github/workflows/actions.yaml @@ -40,6 +40,8 @@ jobs: uses: dell/common-github-actions/go-code-tester@main with: threshold: 60 + test-folder: "." + skip-list: "test/integration-tests" malware_security_scan: name: Malware Scanner runs-on: ubuntu-latest diff --git a/Dockerfile b/Dockerfile index 6570e66..4c44da8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ COPY pkg/ pkg/ RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 GO111MODULE=on go build -a -o manager main.go -FROM registry.access.redhat.com/ubi8/ubi-minimal:latest +FROM registry.access.redhat.com/ubi8/ubi-minimal@sha256:3aa3f379a81013bd3264faa0af87d201cdaa5981050d78c567b48fdfd5b38bb8 RUN microdnf install yum \ && yum -y update-minimal --security --sec-severity=Important --sec-severity=Critical \ diff --git a/PROJECT b/PROJECT index c354694..e65ab57 100644 --- a/PROJECT +++ b/PROJECT @@ -16,6 +16,9 @@ resources: kind: CSIPowerMax path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 - api: crdVersion: v1 namespaced: true @@ -25,6 +28,9 @@ resources: kind: CSIPowerMaxRevProxy path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 - api: crdVersion: v1 namespaced: true @@ -34,6 +40,9 @@ resources: kind: CSIIsilon path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 - api: crdVersion: v1 namespaced: true @@ -43,6 +52,9 @@ resources: kind: CSIUnity path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 - api: crdVersion: v1 namespaced: true @@ -52,6 +64,9 @@ resources: kind: CSIVXFlexOS path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 - api: crdVersion: v1 namespaced: true @@ -61,5 +76,8 @@ resources: kind: CSIPowerStore path: github.com/dell/dell-csi-operator/api/v1 version: v1 + webhooks: + defaulting: true + webhookVersion: v1 version: "3" diff --git a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml index 865b7eb..c4fa8cc 100644 --- a/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csi-operator-certified.clusterserviceversion.yaml @@ -1673,12 +1673,23 @@ spec: - snapshot.storage.k8s.io resources: - volumesnapshotclasses + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - snapshot.storage.k8s.io + resources: - volumesnapshotcontents verbs: - create - delete - get - list + - patch - update - watch - apiGroups: @@ -1686,6 +1697,7 @@ spec: resources: - volumesnapshotcontents/status verbs: + - patch - update - apiGroups: - snapshot.storage.k8s.io diff --git a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml index de261a4..4a27169 100644 --- a/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml +++ b/community_bundle/manifests/dell-csi-operator.clusterserviceversion.yaml @@ -1672,12 +1672,23 @@ spec: - snapshot.storage.k8s.io resources: - volumesnapshotclasses + verbs: + - create + - delete + - get + - list + - update + - watch + - apiGroups: + - snapshot.storage.k8s.io + resources: - volumesnapshotcontents verbs: - create - delete - get - list + - patch - update - watch - apiGroups: @@ -1685,6 +1696,7 @@ spec: resources: - volumesnapshotcontents/status verbs: + - patch - update - apiGroups: - snapshot.storage.k8s.io diff --git a/config/rbac/role.yaml b/config/rbac/role.yaml index ab8371f..fcbe63d 100644 --- a/config/rbac/role.yaml +++ b/config/rbac/role.yaml @@ -150,12 +150,23 @@ rules: - snapshot.storage.k8s.io resources: - volumesnapshotclasses + verbs: + - create + - delete + - get + - list + - update + - watch +- apiGroups: + - snapshot.storage.k8s.io + resources: - volumesnapshotcontents verbs: - create - delete - get - list + - patch - update - watch - apiGroups: @@ -163,6 +174,7 @@ rules: resources: - volumesnapshotcontents/status verbs: + - patch - update - apiGroups: - snapshot.storage.k8s.io diff --git a/config/samples/storage_v1_csiisilon.yaml b/config/samples/storage_v1_csiisilon.yaml index d77bee2..6c4378e 100644 --- a/config/samples/storage_v1_csiisilon.yaml +++ b/config/samples/storage_v1_csiisilon.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. diff --git a/config/samples/storage_v1_csipowermax.yaml b/config/samples/storage_v1_csipowermax.yaml index bdc8ef4..96b53ce 100644 --- a/config/samples/storage_v1_csipowermax.yaml +++ b/config/samples/storage_v1_csipowermax.yaml @@ -5,8 +5,8 @@ metadata: namespace: test-powermax spec: driver: - # Config version for CSI PowerMax v2.1.0 driver - configVersion: v2.1.0 + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -15,8 +15,8 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerMax driver v2.1.0 - image: dellemc/csi-powermax:v2.1.0 + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -73,6 +73,7 @@ spec: # default values: None - name: "X_CSI_GRPC_MAX_THREADS" value: "4" + node: envs: # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the driver is going to configure diff --git a/controllers/csiisilon_controller.go b/controllers/csiisilon_controller.go index ab7e9db..0d80334 100644 --- a/controllers/csiisilon_controller.go +++ b/controllers/csiisilon_controller.go @@ -60,8 +60,9 @@ type CSIIsilonReconciler struct { // +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=get;list;watch;create;update;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments,verbs=get;list;watch;create;update;patch // +kubebuilder:rbac:groups="storage.k8s.io",resources=csinodes,verbs=get;list;watch;create;update -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses;volumesnapshotcontents,verbs=get;list;watch;create;update;delete -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses,verbs=get;list;watch;create;update;delete +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents,verbs=get;list;watch;create;update;delete;patch +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update;patch // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots;volumesnapshots/status,verbs=get;list;watch;update // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=create;list;watch;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments/status,verbs=patch diff --git a/controllers/csipowermax_controller.go b/controllers/csipowermax_controller.go index ed2cb2b..0744d68 100644 --- a/controllers/csipowermax_controller.go +++ b/controllers/csipowermax_controller.go @@ -65,8 +65,9 @@ type CSIPowerMaxReconciler struct { // +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=get;list;watch;create;update;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments,verbs=get;list;watch;create;update;patch // +kubebuilder:rbac:groups="storage.k8s.io",resources=csinodes,verbs=get;list;watch;create;update -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses;volumesnapshotcontents,verbs=get;list;watch;create;update;delete -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses,verbs=get;list;watch;create;update;delete +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents,verbs=get;list;watch;create;update;delete;patch +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update;patch // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots;volumesnapshots/status,verbs=get;list;watch;update // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=create;list;watch;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments/status,verbs=patch diff --git a/controllers/csipowerstore_controller.go b/controllers/csipowerstore_controller.go index 0621359..c432dbc 100644 --- a/controllers/csipowerstore_controller.go +++ b/controllers/csipowerstore_controller.go @@ -60,8 +60,9 @@ type CSIPowerStoreReconciler struct { // +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=get;list;watch;create;update;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments,verbs=get;list;watch;create;update;patch // +kubebuilder:rbac:groups="storage.k8s.io",resources=csinodes,verbs=get;list;watch;create;update -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses;volumesnapshotcontents,verbs=get;list;watch;create;update;delete -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses,verbs=get;list;watch;create;update;delete +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents,verbs=get;list;watch;create;update;delete;patch +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update;patch // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots;volumesnapshots/status,verbs=get;list;watch;update // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=create;list;watch;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments/status,verbs=patch diff --git a/controllers/csiunity_controller.go b/controllers/csiunity_controller.go index a6c9af7..4a773dc 100644 --- a/controllers/csiunity_controller.go +++ b/controllers/csiunity_controller.go @@ -67,8 +67,9 @@ type CSIUnityReconciler struct { // +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=get;list;watch;create;update;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments,verbs=get;list;watch;create;update;patch // +kubebuilder:rbac:groups="storage.k8s.io",resources=csinodes,verbs=get;list;watch;create;update -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses;volumesnapshotcontents,verbs=get;list;watch;create;update;delete -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses,verbs=get;list;watch;create;update;delete +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents,verbs=get;list;watch;create;update;delete;patch +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update;patch // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots;volumesnapshots/status,verbs=get;list;watch;update // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=create;list;watch;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments/status,verbs=patch diff --git a/controllers/csivxflexos_controller.go b/controllers/csivxflexos_controller.go index 29d469f..963434f 100644 --- a/controllers/csivxflexos_controller.go +++ b/controllers/csivxflexos_controller.go @@ -67,8 +67,9 @@ type CSIVXFlexOSReconciler struct { // +kubebuilder:rbac:groups="storage.k8s.io",resources=storageclasses,verbs=get;list;watch;create;update;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments,verbs=get;list;watch;create;update;patch // +kubebuilder:rbac:groups="storage.k8s.io",resources=csinodes,verbs=get;list;watch;create;update -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses;volumesnapshotcontents,verbs=get;list;watch;create;update;delete -// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotclasses,verbs=get;list;watch;create;update;delete +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents,verbs=get;list;watch;create;update;delete;patch +// +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshotcontents/status,verbs=update;patch // +kubebuilder:rbac:groups="snapshot.storage.k8s.io",resources=volumesnapshots;volumesnapshots/status,verbs=get;list;watch;update // +kubebuilder:rbac:groups="apiextensions.k8s.io",resources=customresourcedefinitions,verbs=create;list;watch;delete // +kubebuilder:rbac:groups="storage.k8s.io",resources=volumeattachments/status,verbs=patch @@ -131,7 +132,7 @@ func (r *CSIVXFlexOSReconciler) InitializeDriverSpec(instance storagev1.CSIDrive isDriverupdate := false driver := instance.GetDriver() ctx := context.Background() - if driver.ConfigVersion == "v5" { + if driver.ConfigVersion == "v2.1.0" { var newmdm corev1.EnvVar mdmVar, err := r.GetMDMFromSecret(ctx, instance, reqLogger) if err != nil { diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 7b21cd4..d7cf28a 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -190,12 +190,23 @@ rules: - snapshot.storage.k8s.io resources: - volumesnapshotclasses + verbs: + - create + - delete + - get + - list + - update + - watch +- apiGroups: + - snapshot.storage.k8s.io + resources: - volumesnapshotcontents verbs: - create - delete - get - list + - patch - update - watch - apiGroups: @@ -203,6 +214,7 @@ rules: resources: - volumesnapshotcontents/status verbs: + - patch - update - apiGroups: - snapshot.storage.k8s.io diff --git a/driverconfig/config.yaml b/driverconfig/config.yaml index a645d57..85f5959 100644 --- a/driverconfig/config.yaml +++ b/driverconfig/config.yaml @@ -9,30 +9,24 @@ supportedK8sVersions: drivers: - name: powermax configVersions: - - configVersion: v2.1.0 + - configVersion: v2.2.0 useDefaults: true supportedVersions: - - version: v120 - version: v121 - version: v122 - - configVersion: v2.0.0 + - version: v123 + - configVersion: v2.1.0 useDefaults: false supportedVersions: - - version: v119 - provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0 - attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3 - resizer: quay.io/k8scsi/csi-resizer:v1.1.0 - registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 - version: v120 - version: v121 - version: v122 attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 - provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 - resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 + provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 + resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 - - configVersion: v6 + - configVersion: v2.0.0 useDefaults: false supportedVersions: - version: v119 @@ -43,11 +37,12 @@ drivers: registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 - version: v120 - version: v121 - attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.2.1 - provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.1 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.0 + - version: v122 + attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 + provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v2.2.2 + snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 - registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.2.0 + registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 - name: unity configVersions: - configVersion: v2.2.0 @@ -86,12 +81,23 @@ drivers: registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 - name: vxflexos configVersions: - - configVersion: v2.1.0 + - configVersion: v2.2.0 useDefaults: true + supportedVersions: + - version: v121 + - version: v122 + - version: v123 + - configVersion: v2.1.0 + useDefaults: false supportedVersions: - version: v120 - version: v121 - version: v122 + attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.3.0 + provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v3.0.0 + snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.2.1 + resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.3.0 + registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 - configVersion: v2.0.0 useDefaults: false supportedVersions: @@ -109,18 +115,6 @@ drivers: snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.1.1 resizer: k8s.gcr.io/sig-storage/csi-resizer:v1.2.0 registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.3.0 - - configVersion: v5 - useDefaults: false - supportedVersions: - - version: v119 - - version: v120 - - version: v121 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v4.0.0 - attacher: k8s.gcr.io/sig-storage/csi-attacher:v3.1.0 - provisioner: k8s.gcr.io/sig-storage/csi-provisioner:v2.1.0 - snapshotter: k8s.gcr.io/sig-storage/csi-snapshotter:v3.0.3 - resizer: quay.io/k8scsi/csi-resizer:v1.1.0 - registrar: k8s.gcr.io/sig-storage/csi-node-driver-registrar:v2.1.0 - name: isilon configVersions: - configVersion: v2.2.0 @@ -354,6 +348,8 @@ extensions: tag: dellemc/sdc:3.6 - version: v122 tag: dellemc/sdc:3.6 + - version: v123 + tag: dellemc/sdc:3.6 - name: sdc images: - version: v117 @@ -368,6 +364,8 @@ extensions: tag: dellemc/sdc:3.6 - version: v122 tag: dellemc/sdc:3.6 + - version: v123 + tag: dellemc/sdc:3.6 - name: external-health-monitor images: - version: v120 diff --git a/driverconfig/isilon_v220_v121.json b/driverconfig/isilon_v220_v121.json index c2f9189..b62e14c 100644 --- a/driverconfig/isilon_v220_v121.json +++ b/driverconfig/isilon_v220_v121.json @@ -35,6 +35,14 @@ "DefaultValueForController": "true", "DefaultValueForNode": "true" }, + { + "Name": "X_CSI_ISI_AUTH_TYPE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "0", + "DefaultValueForNode": "0" + }, { "Name": "X_CSI_NODE_NAME", "CSIEnvType": "EnvVarReferenceType", diff --git a/driverconfig/isilon_v220_v122.json b/driverconfig/isilon_v220_v122.json index c2f9189..b62e14c 100644 --- a/driverconfig/isilon_v220_v122.json +++ b/driverconfig/isilon_v220_v122.json @@ -35,6 +35,14 @@ "DefaultValueForController": "true", "DefaultValueForNode": "true" }, + { + "Name": "X_CSI_ISI_AUTH_TYPE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "0", + "DefaultValueForNode": "0" + }, { "Name": "X_CSI_NODE_NAME", "CSIEnvType": "EnvVarReferenceType", diff --git a/driverconfig/isilon_v220_v123.json b/driverconfig/isilon_v220_v123.json index c2f9189..b62e14c 100644 --- a/driverconfig/isilon_v220_v123.json +++ b/driverconfig/isilon_v220_v123.json @@ -35,6 +35,14 @@ "DefaultValueForController": "true", "DefaultValueForNode": "true" }, + { + "Name": "X_CSI_ISI_AUTH_TYPE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "0", + "DefaultValueForNode": "0" + }, { "Name": "X_CSI_NODE_NAME", "CSIEnvType": "EnvVarReferenceType", diff --git a/driverconfig/powermax_v6_v119.json b/driverconfig/powermax_v220_v121.json similarity index 88% rename from driverconfig/powermax_v6_v119.json rename to driverconfig/powermax_v220_v121.json index 823eb6b..5d0ffee 100644 --- a/driverconfig/powermax_v6_v119.json +++ b/driverconfig/powermax_v220_v121.json @@ -70,14 +70,6 @@ "DefaultValueForController": "controller", "DefaultValueForNode": "node" }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, { "Name": "X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION", "CSIEnvType": "Boolean", @@ -237,6 +229,30 @@ "SetForNode": false, "DefaultValueForController": "replication.storage.dell.com/", "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_UNISPHERE_TIMEOUT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "5m", + "DefaultValueForNode": "5m" + }, + { + "Name": "X_CSI_POWERMAX_CONFIG_PATH", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/powermax-config-params/driver-config-params.yaml", + "DefaultValueForNode": "/powermax-config-params/driver-config-params.yaml" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" } ], "driverNodeVolumes": [ @@ -303,6 +319,12 @@ "path": "/run/dbus/system_bus_socket", "type": "Socket" } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumes": [ @@ -317,6 +339,12 @@ "secretName": "powermax-certs", "optional": true } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumeMounts": [ @@ -328,6 +356,10 @@ "mountPath": "/certs", "name": "certs", "readOnly": true + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "driverNodeVolumeMounts": [ @@ -365,6 +397,10 @@ { "name": "dbus-socket", "mountPath": "/run/dbus/system_bus_socket" + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "sidecarParams": [ @@ -493,6 +529,31 @@ "name": "driver-path" } ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=180s", + "--v=5", + "--leader-election", + "--monitor-interval=60s", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] } ], "storageClassParams": [ diff --git a/driverconfig/powermax_v6_v120.json b/driverconfig/powermax_v220_v122.json similarity index 88% rename from driverconfig/powermax_v6_v120.json rename to driverconfig/powermax_v220_v122.json index 823eb6b..5d0ffee 100644 --- a/driverconfig/powermax_v6_v120.json +++ b/driverconfig/powermax_v220_v122.json @@ -70,14 +70,6 @@ "DefaultValueForController": "controller", "DefaultValueForNode": "node" }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, { "Name": "X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION", "CSIEnvType": "Boolean", @@ -237,6 +229,30 @@ "SetForNode": false, "DefaultValueForController": "replication.storage.dell.com/", "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_UNISPHERE_TIMEOUT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "5m", + "DefaultValueForNode": "5m" + }, + { + "Name": "X_CSI_POWERMAX_CONFIG_PATH", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/powermax-config-params/driver-config-params.yaml", + "DefaultValueForNode": "/powermax-config-params/driver-config-params.yaml" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" } ], "driverNodeVolumes": [ @@ -303,6 +319,12 @@ "path": "/run/dbus/system_bus_socket", "type": "Socket" } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumes": [ @@ -317,6 +339,12 @@ "secretName": "powermax-certs", "optional": true } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumeMounts": [ @@ -328,6 +356,10 @@ "mountPath": "/certs", "name": "certs", "readOnly": true + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "driverNodeVolumeMounts": [ @@ -365,6 +397,10 @@ { "name": "dbus-socket", "mountPath": "/run/dbus/system_bus_socket" + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "sidecarParams": [ @@ -493,6 +529,31 @@ "name": "driver-path" } ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=180s", + "--v=5", + "--leader-election", + "--monitor-interval=60s", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] } ], "storageClassParams": [ diff --git a/driverconfig/powermax_v6_v121.json b/driverconfig/powermax_v220_v123.json similarity index 88% rename from driverconfig/powermax_v6_v121.json rename to driverconfig/powermax_v220_v123.json index 823eb6b..5d0ffee 100644 --- a/driverconfig/powermax_v6_v121.json +++ b/driverconfig/powermax_v220_v123.json @@ -70,14 +70,6 @@ "DefaultValueForController": "controller", "DefaultValueForNode": "node" }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, { "Name": "X_CSI_POWERMAX_SKIP_CERTIFICATE_VALIDATION", "CSIEnvType": "Boolean", @@ -237,6 +229,30 @@ "SetForNode": false, "DefaultValueForController": "replication.storage.dell.com/", "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_UNISPHERE_TIMEOUT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "5m", + "DefaultValueForNode": "5m" + }, + { + "Name": "X_CSI_POWERMAX_CONFIG_PATH", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/powermax-config-params/driver-config-params.yaml", + "DefaultValueForNode": "/powermax-config-params/driver-config-params.yaml" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" } ], "driverNodeVolumes": [ @@ -303,6 +319,12 @@ "path": "/run/dbus/system_bus_socket", "type": "Socket" } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumes": [ @@ -317,6 +339,12 @@ "secretName": "powermax-certs", "optional": true } + }, + { + "name": "powermax-config-params", + "configMap": { + "name": "powermax-config-params" + } } ], "driverControllerVolumeMounts": [ @@ -328,6 +356,10 @@ "mountPath": "/certs", "name": "certs", "readOnly": true + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "driverNodeVolumeMounts": [ @@ -365,6 +397,10 @@ { "name": "dbus-socket", "mountPath": "/run/dbus/system_bus_socket" + }, + { + "mountPath": "/powermax-config-params", + "name": "powermax-config-params" } ], "sidecarParams": [ @@ -493,6 +529,31 @@ "name": "driver-path" } ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=180s", + "--v=5", + "--leader-election", + "--monitor-interval=60s", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] } ], "storageClassParams": [ diff --git a/driverconfig/vxflexos_v210_v120.json b/driverconfig/vxflexos_v210_v120.json index 4e56110..9b86cec 100644 --- a/driverconfig/vxflexos_v210_v120.json +++ b/driverconfig/vxflexos_v210_v120.json @@ -334,27 +334,6 @@ } ] }, - { - "name": "snapshotter", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, { "name": "external-health-monitor", "optional": true, diff --git a/driverconfig/vxflexos_v220_v121.json b/driverconfig/vxflexos_v220_v121.json new file mode 100644 index 0000000..9b86cec --- /dev/null +++ b/driverconfig/vxflexos_v220_v121.json @@ -0,0 +1,581 @@ +{ + "driverConfig": { + "controllerHA" : true, + "enableEphemeralVolumes": true, + "driverEnvs": [ + { + "Name": "CSI_ENDPOINT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/var/run/csi/csi.sock", + "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + }, + { + "Name": "X_CSI_DEBUG", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "true", + "DefaultValueForNode": "true" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_MODE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "controller", + "DefaultValueForNode": "node" + }, + { + "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", + "CSIEnvType": "Boolean", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "false" + }, + { + "Name": "X_CSI_PRIVATE_MOUNT_DIR", + "CSIEnvType": "String", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" + }, + { + "Name": "SSL_CERT_DIR", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/certs", + "DefaultValueForNode": "/certs" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" + } + ], + + "driverArgs": [ + "--array-config=/vxflexos-config/config", + "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + ], + + "driverNodeVolumes": [ + { + "hostPath": { + "path": "/var/lib/kubelet/plugins_registry/", + "type": "DirectoryOrCreate" + }, + "name": "registration-dir" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "type": "DirectoryOrCreate" + }, + "name": "driver-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "type": "DirectoryOrCreate" + }, + "name": "volumedevices-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/pods", + "type": "Directory" + }, + "name": "pods-path" + }, + { + "hostPath": { + "path": "/dev", + "type": "Directory" + }, + "name": "dev" + }, + { + "hostPath": { + "path": "/opt/emc/scaleio/sdc/bin", + "type": "DirectoryOrCreate" + }, + "name": "scaleio-path-opt" + }, + { + "hostPath": { + "path": "/etc/os-release", + "type": "File" + }, + "name": "os-release" + }, + { + "hostPath": { + "path": "/var/emc-scaleio", + "type": "DirectoryOrCreate" + }, + "name": "sdc-storage" + }, + { + "hostPath": { + "path": "/var/sio-config", + "type": "DirectoryOrCreate" + }, + "name": "sdc-config" + }, + { + "hostPath": { + "path": "/etc/udev/rules.d", + "type": "Directory" + }, + "name": "udev-d" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumes": [ + { + "emptyDir": {}, + "name": "socket-dir" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + ], + "driverNodeVolumeMounts": [ + { + "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "name": "driver-path" + }, + { + "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "mountPropagation": "Bidirectional", + "name": "volumedevices-path" + }, + { + "mountPath": "/var/lib/kubelet/pods", + "mountPropagation": "Bidirectional", + "name": "pods-path" + }, + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/opt/emc/scaleio/sdc/bin", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + + ], + "sidecarParams": [ + { + "name": "provisioner", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--volume-name-uuid-length=10", + "--timeout=180s", + "--worker-threads=6", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "attacher", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--timeout=180s", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "snapshotter", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "registrar", + "args": [ + "--v=5", + "--csi-address=$(ADDRESS)", + "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/csi/csi_sock" + }, + { + "name": "KUBE_NODE_NAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/registration", + "name": "registration-dir" + }, + { + "mountPath": "/csi", + "name": "driver-path" + } + ] + }, + { + "name": "resizer", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "sdc-monitor", + "optional": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_PID", + "value": "0" + }, + { + "name": "HOST_NET", + "value": "1" + }, + { + "name": "MODE", + "value": "monitoring" + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + } + ] + } + ], + "storageClassParams": [ + { + "Name": "storagepool", + "Mandatory": true + } + ], + "storageClassAttrs": [ + { + "name": "allowVolumeExpansion", + "value": true + }, + { + "name": "volumeBindingMode", + "value": "WaitForFirstConsumer" + } + ], + "initContainerParams": [ + { + "name": "sdc", + "SetForNode": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "MODE", + "value": "config" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + }, + { + "name": "REPO_ADDRESS", + "value": "" + }, + { + "name": "REPO_USER", + "valueFrom": { + "secretKeyRef": { + "key": "username", + "name": "sdc-repo-creds", + "optional": true + } + } + }, + { + "name": "REPO_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "password", + "name": "sdc-repo-creds", + "optional": true + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/config", + "name": "sdc-config" + } + ] + } + ] + } + } + \ No newline at end of file diff --git a/driverconfig/vxflexos_v220_v122.json b/driverconfig/vxflexos_v220_v122.json new file mode 100644 index 0000000..9b86cec --- /dev/null +++ b/driverconfig/vxflexos_v220_v122.json @@ -0,0 +1,581 @@ +{ + "driverConfig": { + "controllerHA" : true, + "enableEphemeralVolumes": true, + "driverEnvs": [ + { + "Name": "CSI_ENDPOINT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/var/run/csi/csi.sock", + "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + }, + { + "Name": "X_CSI_DEBUG", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "true", + "DefaultValueForNode": "true" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_MODE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "controller", + "DefaultValueForNode": "node" + }, + { + "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", + "CSIEnvType": "Boolean", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "false" + }, + { + "Name": "X_CSI_PRIVATE_MOUNT_DIR", + "CSIEnvType": "String", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" + }, + { + "Name": "SSL_CERT_DIR", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/certs", + "DefaultValueForNode": "/certs" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" + } + ], + + "driverArgs": [ + "--array-config=/vxflexos-config/config", + "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + ], + + "driverNodeVolumes": [ + { + "hostPath": { + "path": "/var/lib/kubelet/plugins_registry/", + "type": "DirectoryOrCreate" + }, + "name": "registration-dir" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "type": "DirectoryOrCreate" + }, + "name": "driver-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "type": "DirectoryOrCreate" + }, + "name": "volumedevices-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/pods", + "type": "Directory" + }, + "name": "pods-path" + }, + { + "hostPath": { + "path": "/dev", + "type": "Directory" + }, + "name": "dev" + }, + { + "hostPath": { + "path": "/opt/emc/scaleio/sdc/bin", + "type": "DirectoryOrCreate" + }, + "name": "scaleio-path-opt" + }, + { + "hostPath": { + "path": "/etc/os-release", + "type": "File" + }, + "name": "os-release" + }, + { + "hostPath": { + "path": "/var/emc-scaleio", + "type": "DirectoryOrCreate" + }, + "name": "sdc-storage" + }, + { + "hostPath": { + "path": "/var/sio-config", + "type": "DirectoryOrCreate" + }, + "name": "sdc-config" + }, + { + "hostPath": { + "path": "/etc/udev/rules.d", + "type": "Directory" + }, + "name": "udev-d" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumes": [ + { + "emptyDir": {}, + "name": "socket-dir" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + ], + "driverNodeVolumeMounts": [ + { + "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "name": "driver-path" + }, + { + "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "mountPropagation": "Bidirectional", + "name": "volumedevices-path" + }, + { + "mountPath": "/var/lib/kubelet/pods", + "mountPropagation": "Bidirectional", + "name": "pods-path" + }, + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/opt/emc/scaleio/sdc/bin", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + + ], + "sidecarParams": [ + { + "name": "provisioner", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--volume-name-uuid-length=10", + "--timeout=180s", + "--worker-threads=6", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "attacher", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--timeout=180s", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "snapshotter", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "registrar", + "args": [ + "--v=5", + "--csi-address=$(ADDRESS)", + "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/csi/csi_sock" + }, + { + "name": "KUBE_NODE_NAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/registration", + "name": "registration-dir" + }, + { + "mountPath": "/csi", + "name": "driver-path" + } + ] + }, + { + "name": "resizer", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "sdc-monitor", + "optional": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_PID", + "value": "0" + }, + { + "name": "HOST_NET", + "value": "1" + }, + { + "name": "MODE", + "value": "monitoring" + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + } + ] + } + ], + "storageClassParams": [ + { + "Name": "storagepool", + "Mandatory": true + } + ], + "storageClassAttrs": [ + { + "name": "allowVolumeExpansion", + "value": true + }, + { + "name": "volumeBindingMode", + "value": "WaitForFirstConsumer" + } + ], + "initContainerParams": [ + { + "name": "sdc", + "SetForNode": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "MODE", + "value": "config" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + }, + { + "name": "REPO_ADDRESS", + "value": "" + }, + { + "name": "REPO_USER", + "valueFrom": { + "secretKeyRef": { + "key": "username", + "name": "sdc-repo-creds", + "optional": true + } + } + }, + { + "name": "REPO_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "password", + "name": "sdc-repo-creds", + "optional": true + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/config", + "name": "sdc-config" + } + ] + } + ] + } + } + \ No newline at end of file diff --git a/driverconfig/vxflexos_v220_v123.json b/driverconfig/vxflexos_v220_v123.json new file mode 100644 index 0000000..9b86cec --- /dev/null +++ b/driverconfig/vxflexos_v220_v123.json @@ -0,0 +1,581 @@ +{ + "driverConfig": { + "controllerHA" : true, + "enableEphemeralVolumes": true, + "driverEnvs": [ + { + "Name": "CSI_ENDPOINT", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/var/run/csi/csi.sock", + "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + }, + { + "Name": "X_CSI_DEBUG", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "true", + "DefaultValueForNode": "true" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": false, + "DefaultValueForController": "false", + "DefaultValueForNode": "" + }, + { + "Name": "X_CSI_MODE", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "controller", + "DefaultValueForNode": "node" + }, + { + "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", + "CSIEnvType": "Boolean", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "false" + }, + { + "Name": "X_CSI_PRIVATE_MOUNT_DIR", + "CSIEnvType": "String", + "SetForController": false, + "SetForNode": true, + "DefaultValueForController": "", + "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" + }, + { + "Name": "SSL_CERT_DIR", + "CSIEnvType": "String", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "/certs", + "DefaultValueForNode": "/certs" + }, + { + "Name": "X_CSI_HEALTH_MONITOR_ENABLED", + "CSIEnvType": "Boolean", + "SetForController": true, + "SetForNode": true, + "DefaultValueForController": "false", + "DefaultValueForNode": "false" + } + ], + + "driverArgs": [ + "--array-config=/vxflexos-config/config", + "--driver-config-params=/vxflexos-config-params/driver-config-params.yaml" + ], + + "driverNodeVolumes": [ + { + "hostPath": { + "path": "/var/lib/kubelet/plugins_registry/", + "type": "DirectoryOrCreate" + }, + "name": "registration-dir" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "type": "DirectoryOrCreate" + }, + "name": "driver-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "type": "DirectoryOrCreate" + }, + "name": "volumedevices-path" + }, + { + "hostPath": { + "path": "/var/lib/kubelet/pods", + "type": "Directory" + }, + "name": "pods-path" + }, + { + "hostPath": { + "path": "/dev", + "type": "Directory" + }, + "name": "dev" + }, + { + "hostPath": { + "path": "/opt/emc/scaleio/sdc/bin", + "type": "DirectoryOrCreate" + }, + "name": "scaleio-path-opt" + }, + { + "hostPath": { + "path": "/etc/os-release", + "type": "File" + }, + "name": "os-release" + }, + { + "hostPath": { + "path": "/var/emc-scaleio", + "type": "DirectoryOrCreate" + }, + "name": "sdc-storage" + }, + { + "hostPath": { + "path": "/var/sio-config", + "type": "DirectoryOrCreate" + }, + "name": "sdc-config" + }, + { + "hostPath": { + "path": "/etc/udev/rules.d", + "type": "Directory" + }, + "name": "udev-d" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumes": [ + { + "emptyDir": {}, + "name": "socket-dir" + }, + { + "name": "certs", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-certs", + "optional": true + } + }, + { + "name": "vxflexos-config", + "secret": { + "defaultMode": 420, + "secretName": "vxflexos-config", + "optional": true + } + }, + { + "name": "vxflexos-config-params", + "configMap": { + "name": "vxflexos-config-params", + "optional": true + } + } + ], + "driverControllerVolumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + ], + "driverNodeVolumeMounts": [ + { + "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", + "name": "driver-path" + }, + { + "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", + "mountPropagation": "Bidirectional", + "name": "volumedevices-path" + }, + { + "mountPath": "/var/lib/kubelet/pods", + "mountPropagation": "Bidirectional", + "name": "pods-path" + }, + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/opt/emc/scaleio/sdc/bin", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/certs", + "name": "certs", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config", + "name": "vxflexos-config", + "readOnly": true + }, + { + "mountPath": "/vxflexos-config-params", + "name": "vxflexos-config-params", + "readOnly": true + } + + ], + "sidecarParams": [ + { + "name": "provisioner", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--volume-name-uuid-length=10", + "--timeout=180s", + "--worker-threads=6", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "attacher", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--timeout=180s", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "snapshotter", + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "external-health-monitor", + "optional": true, + "args": [ + "--csi-address=$(ADDRESS)", + "--timeout=120s", + "--v=5", + "--leader-election", + "--enable-node-watcher=true", + "--http-endpoint=:8080" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "registrar", + "args": [ + "--v=5", + "--csi-address=$(ADDRESS)", + "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/csi/csi_sock" + }, + { + "name": "KUBE_NODE_NAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/registration", + "name": "registration-dir" + }, + { + "mountPath": "/csi", + "name": "driver-path" + } + ] + }, + { + "name": "resizer", + "args": [ + "--csi-address=$(ADDRESS)", + "--v=5", + "--leader-election" + ], + "envs": [ + { + "name": "ADDRESS", + "value": "/var/run/csi/csi.sock" + } + ], + "volumeMounts": [ + { + "mountPath": "/var/run/csi", + "name": "socket-dir" + } + ] + }, + { + "name": "sdc-monitor", + "optional": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_PID", + "value": "0" + }, + { + "name": "HOST_NET", + "value": "1" + }, + { + "name": "MODE", + "value": "monitoring" + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + } + ] + } + ], + "storageClassParams": [ + { + "Name": "storagepool", + "Mandatory": true + } + ], + "storageClassAttrs": [ + { + "name": "allowVolumeExpansion", + "value": true + }, + { + "name": "volumeBindingMode", + "value": "WaitForFirstConsumer" + } + ], + "initContainerParams": [ + { + "name": "sdc", + "SetForNode": true, + "envs": [ + { + "name": "MDM", + "valueFrom": { + "secretKeyRef": { + "key": "MDM", + "name": "vxflexos-config", + "optional": true + } + } + }, + { + "name": "HOST_DRV_CFG_PATH", + "value": "/opt/emc/scaleio/sdc/bin" + }, + { + "name": "MODE", + "value": "config" + }, + { + "name": "NODENAME", + "valueFrom": { + "fieldRef": { + "apiVersion": "v1", + "fieldPath": "spec.nodeName" + } + } + }, + { + "name": "REPO_ADDRESS", + "value": "" + }, + { + "name": "REPO_USER", + "valueFrom": { + "secretKeyRef": { + "key": "username", + "name": "sdc-repo-creds", + "optional": true + } + } + }, + { + "name": "REPO_PASSWORD", + "valueFrom": { + "secretKeyRef": { + "key": "password", + "name": "sdc-repo-creds", + "optional": true + } + } + } + ], + "volumeMounts": [ + { + "mountPath": "/dev", + "name": "dev" + }, + { + "mountPath": "/host-os-release", + "name": "os-release" + }, + { + "mountPath": "/rules.d", + "name": "udev-d" + }, + { + "mountPath": "/storage", + "name": "sdc-storage" + }, + { + "mountPath": "/host_drv_cfg_path", + "name": "scaleio-path-opt" + }, + { + "mountPath": "/config", + "name": "sdc-config" + } + ] + } + ] + } + } + \ No newline at end of file diff --git a/driverconfig/vxflexos_v5_v119.json b/driverconfig/vxflexos_v5_v119.json deleted file mode 100644 index 0f344a8..0000000 --- a/driverconfig/vxflexos_v5_v119.json +++ /dev/null @@ -1,540 +0,0 @@ -{ - "driverConfig": { - "controllerHA" : true, - "enableEphemeralVolumes": true, - "driverEnvs": [ - { - "Name": "CSI_ENDPOINT", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "/var/run/csi/csi.sock", - "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_MODE", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "controller", - "DefaultValueForNode": "node" - }, -{ - "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", - "CSIEnvType": "Boolean", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "false" - }, - { - "Name": "X_CSI_PRIVATE_MOUNT_DIR", - "CSIEnvType": "String", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" - } - ], - - "driverArgs": [ - "--array-config=/vxflexos-config/config", - "--log-config=/vxflexos-config/log-config/driver-config.yaml" - ], - - "driverNodeVolumes": [ - { - "hostPath": { - "path": "/var/lib/kubelet/plugins_registry/", - "type": "DirectoryOrCreate" - }, - "name": "registration-dir" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "type": "DirectoryOrCreate" - }, - "name": "driver-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "type": "DirectoryOrCreate" - }, - "name": "volumedevices-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/pods", - "type": "Directory" - }, - "name": "pods-path" - }, - { - "hostPath": { - "path": "/dev", - "type": "Directory" - }, - "name": "dev" - }, - { - "hostPath": { - "path": "/opt/emc/scaleio/sdc/bin", - "type": "DirectoryOrCreate" - }, - "name": "scaleio-path-opt" - }, - { - "hostPath": { - "path": "/etc/os-release", - "type": "File" - }, - "name": "os-release" - }, - { - "hostPath": { - "path": "/var/emc-scaleio", - "type": "DirectoryOrCreate" - }, - "name": "sdc-storage" - }, - { - "hostPath": { - "path": "/var/sio-config", - "type": "DirectoryOrCreate" - }, - "name": "sdc-config" - }, - { - "hostPath": { - "path": "/etc/udev/rules.d", - "type": "Directory" - }, - "name": "udev-d" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumes": [ - { - "emptyDir": {}, - "name": "socket-dir" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - ], - "driverNodeVolumeMounts": [ - { - "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "name": "driver-path" - }, - { - "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "mountPropagation": "Bidirectional", - "name": "volumedevices-path" - }, - { - "mountPath": "/var/lib/kubelet/pods", - "mountPropagation": "Bidirectional", - "name": "pods-path" - }, - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/opt/emc/scaleio/sdc/bin", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - - ], - "sidecarParams": [ - { - "name": "provisioner", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--volume-name-uuid-length=10", - "--timeout=180s", - "--worker-threads=6", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "attacher", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--timeout=180s", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "snapshotter", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "registrar", - "args": [ - "--v=5", - "--csi-address=$(ADDRESS)", - "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/csi/csi_sock" - }, - { - "name": "KUBE_NODE_NAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/registration", - "name": "registration-dir" - }, - { - "mountPath": "/csi", - "name": "driver-path" - } - ] - }, - { - "name": "resizer", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "sdc-monitor", - "optional": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_PID", - "value": "0" - }, - { - "name": "HOST_NET", - "value": "1" - }, - { - "name": "MODE", - "value": "monitoring" - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - } - ] - } - ], - "storageClassParams": [ - { - "Name": "storagepool", - "Mandatory": true - } - ], - "storageClassAttrs": [ - { - "name": "allowVolumeExpansion", - "value": true - }, - { - "name": "volumeBindingMode", - "value": "WaitForFirstConsumer" - } - ], - "initContainerParams": [ - { - "name": "sdc", - "SetForNode": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "MODE", - "value": "config" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - }, - { - "name": "REPO_ADDRESS", - "value": "" - }, - { - "name": "REPO_USER", - "valueFrom": { - "secretKeyRef": { - "key": "username", - "name": "sdc-repo-creds", - "optional": true - } - } - }, - { - "name": "REPO_PASSWORD", - "valueFrom": { - "secretKeyRef": { - "key": "password", - "name": "sdc-repo-creds", - "optional": true - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/config", - "name": "sdc-config" - } - ] - } - ] - } -} diff --git a/driverconfig/vxflexos_v5_v120.json b/driverconfig/vxflexos_v5_v120.json deleted file mode 100644 index 9792892..0000000 --- a/driverconfig/vxflexos_v5_v120.json +++ /dev/null @@ -1,540 +0,0 @@ -{ - "driverConfig": { - "controllerHA" : true, - "enableEphemeralVolumes": true, - "driverEnvs": [ - { - "Name": "CSI_ENDPOINT", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "/var/run/csi/csi.sock", - "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_MODE", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "controller", - "DefaultValueForNode": "node" - }, -{ - "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", - "CSIEnvType": "Boolean", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "false" - }, - { - "Name": "X_CSI_PRIVATE_MOUNT_DIR", - "CSIEnvType": "String", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" - } - ], - - "driverArgs": [ - "--array-config=/vxflexos-config/config", - "--log-config=/vxflexos-config/log-config/driver-config.yaml" - ], - - "driverNodeVolumes": [ - { - "hostPath": { - "path": "/var/lib/kubelet/plugins_registry/", - "type": "DirectoryOrCreate" - }, - "name": "registration-dir" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "type": "DirectoryOrCreate" - }, - "name": "driver-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "type": "DirectoryOrCreate" - }, - "name": "volumedevices-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/pods", - "type": "Directory" - }, - "name": "pods-path" - }, - { - "hostPath": { - "path": "/dev", - "type": "Directory" - }, - "name": "dev" - }, - { - "hostPath": { - "path": "/opt/emc/scaleio/sdc/bin", - "type": "DirectoryOrCreate" - }, - "name": "scaleio-path-opt" - }, - { - "hostPath": { - "path": "/etc/os-release", - "type": "File" - }, - "name": "os-release" - }, - { - "hostPath": { - "path": "/var/emc-scaleio", - "type": "DirectoryOrCreate" - }, - "name": "sdc-storage" - }, - { - "hostPath": { - "path": "/var/sio-config", - "type": "DirectoryOrCreate" - }, - "name": "sdc-config" - }, - { - "hostPath": { - "path": "/etc/udev/rules.d", - "type": "Directory" - }, - "name": "udev-d" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumes": [ - { - "emptyDir": {}, - "name": "socket-dir" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - ], - "driverNodeVolumeMounts": [ - { - "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "name": "driver-path" - }, - { - "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "mountPropagation": "Bidirectional", - "name": "volumedevices-path" - }, - { - "mountPath": "/var/lib/kubelet/pods", - "mountPropagation": "Bidirectional", - "name": "pods-path" - }, - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/opt/emc/scaleio/sdc/bin", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - - ], - "sidecarParams": [ - { - "name": "provisioner", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--volume-name-uuid-length=10", - "--timeout=180s", - "--worker-threads=6", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "attacher", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--timeout=180s", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "snapshotter", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "registrar", - "args": [ - "--v=5", - "--csi-address=$(ADDRESS)", - "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/csi/csi_sock" - }, - { - "name": "KUBE_NODE_NAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/registration", - "name": "registration-dir" - }, - { - "mountPath": "/csi", - "name": "driver-path" - } - ] - }, - { - "name": "resizer", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "sdc-monitor", - "optional": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_PID", - "value": "0" - }, - { - "name": "HOST_NET", - "value": "1" - }, - { - "name": "MODE", - "value": "monitoring" - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - } - ] - } - ], - "storageClassParams": [ - { - "Name": "storagepool", - "Mandatory": true - } - ], - "storageClassAttrs": [ - { - "name": "allowVolumeExpansion", - "value": true - }, - { - "name": "volumeBindingMode", - "value": "WaitForFirstConsumer" - } - ], - "initContainerParams": [ - { - "name": "sdc", - "SetForNode": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "MODE", - "value": "config" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - }, - { - "name": "REPO_ADDRESS", - "value": "" - }, - { - "name": "REPO_USER", - "valueFrom": { - "secretKeyRef": { - "key": "username", - "name": "sdc-repo-creds", - "optional": true - } - } - }, - { - "name": "REPO_PASSWORD", - "valueFrom": { - "secretKeyRef": { - "key": "password", - "name": "sdc-repo-creds", - "optional": true - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/config", - "name": "sdc-config" - } - ] - } - ] - } -} \ No newline at end of file diff --git a/driverconfig/vxflexos_v5_v121.json b/driverconfig/vxflexos_v5_v121.json deleted file mode 100644 index 0f344a8..0000000 --- a/driverconfig/vxflexos_v5_v121.json +++ /dev/null @@ -1,540 +0,0 @@ -{ - "driverConfig": { - "controllerHA" : true, - "enableEphemeralVolumes": true, - "driverEnvs": [ - { - "Name": "CSI_ENDPOINT", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "/var/run/csi/csi.sock", - "DefaultValueForNode": "unix:///var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - }, - { - "Name": "X_CSI_DEBUG", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "true", - "DefaultValueForNode": "true" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT", - "CSIEnvType": "Boolean", - "SetForController": true, - "SetForNode": false, - "DefaultValueForController": "false", - "DefaultValueForNode": "" - }, - { - "Name": "X_CSI_MODE", - "CSIEnvType": "String", - "SetForController": true, - "SetForNode": true, - "DefaultValueForController": "controller", - "DefaultValueForNode": "node" - }, -{ - "Name": "X_CSI_ALLOW_RWO_MULTI_POD_ACCESS", - "CSIEnvType": "Boolean", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "false" - }, - { - "Name": "X_CSI_PRIVATE_MOUNT_DIR", - "CSIEnvType": "String", - "SetForController": false, - "SetForNode": true, - "DefaultValueForController": "", - "DefaultValueForNode": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com/disks" - } - ], - - "driverArgs": [ - "--array-config=/vxflexos-config/config", - "--log-config=/vxflexos-config/log-config/driver-config.yaml" - ], - - "driverNodeVolumes": [ - { - "hostPath": { - "path": "/var/lib/kubelet/plugins_registry/", - "type": "DirectoryOrCreate" - }, - "name": "registration-dir" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "type": "DirectoryOrCreate" - }, - "name": "driver-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "type": "DirectoryOrCreate" - }, - "name": "volumedevices-path" - }, - { - "hostPath": { - "path": "/var/lib/kubelet/pods", - "type": "Directory" - }, - "name": "pods-path" - }, - { - "hostPath": { - "path": "/dev", - "type": "Directory" - }, - "name": "dev" - }, - { - "hostPath": { - "path": "/opt/emc/scaleio/sdc/bin", - "type": "DirectoryOrCreate" - }, - "name": "scaleio-path-opt" - }, - { - "hostPath": { - "path": "/etc/os-release", - "type": "File" - }, - "name": "os-release" - }, - { - "hostPath": { - "path": "/var/emc-scaleio", - "type": "DirectoryOrCreate" - }, - "name": "sdc-storage" - }, - { - "hostPath": { - "path": "/var/sio-config", - "type": "DirectoryOrCreate" - }, - "name": "sdc-config" - }, - { - "hostPath": { - "path": "/etc/udev/rules.d", - "type": "Directory" - }, - "name": "udev-d" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumes": [ - { - "emptyDir": {}, - "name": "socket-dir" - }, - { - "name": "certs", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-certs", - "optional": true - } - }, - { - "name": "vxflexos-config", - "secret": { - "defaultMode": 420, - "secretName": "vxflexos-config", - "optional": true - } - }, - { - "name": "log-config", - "configMap": { - "name": "driver-config", - "optional": true - } - } - ], - "driverControllerVolumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - ], - "driverNodeVolumeMounts": [ - { - "mountPath": "/var/lib/kubelet/plugins/vxflexos.emc.dell.com", - "name": "driver-path" - }, - { - "mountPath": "/var/lib/kubelet/plugins/kubernetes.io/csi/volumeDevices", - "mountPropagation": "Bidirectional", - "name": "volumedevices-path" - }, - { - "mountPath": "/var/lib/kubelet/pods", - "mountPropagation": "Bidirectional", - "name": "pods-path" - }, - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/opt/emc/scaleio/sdc/bin", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/certs", - "name": "certs", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config", - "name": "vxflexos-config", - "readOnly": true - }, - { - "mountPath": "/vxflexos-config/log-config", - "name": "log-config", - "readOnly": true - } - - ], - "sidecarParams": [ - { - "name": "provisioner", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--volume-name-uuid-length=10", - "--timeout=180s", - "--worker-threads=6", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "attacher", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--timeout=180s", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "snapshotter", - "args": [ - "--csi-address=$(ADDRESS)", - "--timeout=120s", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "registrar", - "args": [ - "--v=5", - "--csi-address=$(ADDRESS)", - "--kubelet-registration-path=/var/lib/kubelet/plugins/vxflexos.emc.dell.com/csi_sock" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/csi/csi_sock" - }, - { - "name": "KUBE_NODE_NAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/registration", - "name": "registration-dir" - }, - { - "mountPath": "/csi", - "name": "driver-path" - } - ] - }, - { - "name": "resizer", - "args": [ - "--csi-address=$(ADDRESS)", - "--v=5", - "--leader-election" - ], - "envs": [ - { - "name": "ADDRESS", - "value": "/var/run/csi/csi.sock" - } - ], - "volumeMounts": [ - { - "mountPath": "/var/run/csi", - "name": "socket-dir" - } - ] - }, - { - "name": "sdc-monitor", - "optional": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_PID", - "value": "0" - }, - { - "name": "HOST_NET", - "value": "1" - }, - { - "name": "MODE", - "value": "monitoring" - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - } - ] - } - ], - "storageClassParams": [ - { - "Name": "storagepool", - "Mandatory": true - } - ], - "storageClassAttrs": [ - { - "name": "allowVolumeExpansion", - "value": true - }, - { - "name": "volumeBindingMode", - "value": "WaitForFirstConsumer" - } - ], - "initContainerParams": [ - { - "name": "sdc", - "SetForNode": true, - "envs": [ - { - "name": "MDM", - "valueFrom": { - "secretKeyRef": { - "key": "MDM", - "name": "vxflexos-config", - "optional": true - } - } - }, - { - "name": "HOST_DRV_CFG_PATH", - "value": "/opt/emc/scaleio/sdc/bin" - }, - { - "name": "MODE", - "value": "config" - }, - { - "name": "NODENAME", - "valueFrom": { - "fieldRef": { - "apiVersion": "v1", - "fieldPath": "spec.nodeName" - } - } - }, - { - "name": "REPO_ADDRESS", - "value": "" - }, - { - "name": "REPO_USER", - "valueFrom": { - "secretKeyRef": { - "key": "username", - "name": "sdc-repo-creds", - "optional": true - } - } - }, - { - "name": "REPO_PASSWORD", - "valueFrom": { - "secretKeyRef": { - "key": "password", - "name": "sdc-repo-creds", - "optional": true - } - } - } - ], - "volumeMounts": [ - { - "mountPath": "/dev", - "name": "dev" - }, - { - "mountPath": "/host-os-release", - "name": "os-release" - }, - { - "mountPath": "/rules.d", - "name": "udev-d" - }, - { - "mountPath": "/storage", - "name": "sdc-storage" - }, - { - "mountPath": "/host_drv_cfg_path", - "name": "scaleio-path-opt" - }, - { - "mountPath": "/config", - "name": "sdc-config" - } - ] - } - ] - } -} diff --git a/pkg/resources/deployment/deployment.go b/pkg/resources/deployment/deployment.go index 3a019c1..eaa4331 100644 --- a/pkg/resources/deployment/deployment.go +++ b/pkg/resources/deployment/deployment.go @@ -3,7 +3,6 @@ package deployment import ( "context" "fmt" - csiv1 "github.com/dell/dell-csi-operator/api/v1" "github.com/dell/dell-csi-operator/pkg/constants" "github.com/dell/dell-csi-operator/pkg/ctrlconfig" diff --git a/pkg/resources/rbac/controllerrbac.go b/pkg/resources/rbac/controllerrbac.go index e363d91..05f7583 100644 --- a/pkg/resources/rbac/controllerrbac.go +++ b/pkg/resources/rbac/controllerrbac.go @@ -3,7 +3,6 @@ package rbac import ( "context" "fmt" - csiv1 "github.com/dell/dell-csi-operator/api/v1" "github.com/dell/dell-csi-operator/pkg/resources" "github.com/go-logr/logr" @@ -101,7 +100,7 @@ func NewControllerClusterRole(instance csiv1.CSIDriver, customClusterRoleName bo { APIGroups: []string{"snapshot.storage.k8s.io"}, Resources: []string{"volumesnapshotcontents"}, - Verbs: []string{"create", "get", "list", "watch", "update", "delete"}, + Verbs: []string{"create", "get", "list", "watch", "update", "delete", "patch"}, }, { APIGroups: []string{"snapshot.storage.k8s.io"}, @@ -111,7 +110,7 @@ func NewControllerClusterRole(instance csiv1.CSIDriver, customClusterRoleName bo { APIGroups: []string{"snapshot.storage.k8s.io"}, Resources: []string{"volumesnapshotcontents/status"}, - Verbs: []string{"update"}, + Verbs: []string{"update", "patch"}, }, { APIGroups: []string{"snapshot.storage.k8s.io"}, diff --git a/samples/isilon_v220_k8s_121.yaml b/samples/isilon_v220_k8s_121.yaml index a1461cf..ef248ee 100644 --- a/samples/isilon_v220_k8s_121.yaml +++ b/samples/isilon_v220_k8s_121.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. @@ -111,6 +119,25 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controller deployment, if required. + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Equal" + # value: "true" + # 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. @@ -139,6 +166,30 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # 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" + sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] diff --git a/samples/isilon_v220_k8s_122.yaml b/samples/isilon_v220_k8s_122.yaml index a1461cf..ef248ee 100644 --- a/samples/isilon_v220_k8s_122.yaml +++ b/samples/isilon_v220_k8s_122.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. @@ -111,6 +119,25 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controller deployment, if required. + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Equal" + # value: "true" + # 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. @@ -139,6 +166,30 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # 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" + sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] diff --git a/samples/isilon_v220_k8s_123.yaml b/samples/isilon_v220_k8s_123.yaml index a1461cf..ef248ee 100644 --- a/samples/isilon_v220_k8s_123.yaml +++ b/samples/isilon_v220_k8s_123.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. @@ -111,6 +119,25 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controller deployment, if required. + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Equal" + # value: "true" + # 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. @@ -139,6 +166,30 @@ spec: - 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # 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" + sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] diff --git a/samples/isilon_v220_ops_48.yaml b/samples/isilon_v220_ops_48.yaml index 3dd2c11..cf79006 100644 --- a/samples/isilon_v220_ops_48.yaml +++ b/samples/isilon_v220_ops_48.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. @@ -102,6 +110,25 @@ spec: - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS value: "0777" + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controller deployment, if required. + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Equal" + # value: "true" + # 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. @@ -122,6 +149,30 @@ spec: - name: X_CSI_ALLOWED_NETWORKS value: "" + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # 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" + sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] diff --git a/samples/isilon_v220_ops_49.yaml b/samples/isilon_v220_ops_49.yaml index 3dd2c11..cf79006 100644 --- a/samples/isilon_v220_ops_49.yaml +++ b/samples/isilon_v220_ops_49.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. @@ -102,6 +110,25 @@ spec: - name: X_CSI_ISI_VOLUME_PATH_PERMISSIONS value: "0777" + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controller deployment, if required. + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Equal" + # value: "true" + # 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. @@ -122,6 +149,30 @@ spec: - name: X_CSI_ALLOWED_NETWORKS value: "" + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # 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" + sideCars: - name: provisioner args: ["--volume-name-prefix=csipscale"] diff --git a/samples/powermax_revproxy_standalone_with_driver.yaml b/samples/powermax_revproxy_standalone_with_driver.yaml index dab45d4..e2b8934 100644 --- a/samples/powermax_revproxy_standalone_with_driver.yaml +++ b/samples/powermax_revproxy_standalone_with_driver.yaml @@ -68,8 +68,8 @@ metadata: namespace: test-powermax spec: driver: - # Config version for CSI PowerMax v2.1.0 driver - configVersion: v2.1.0 + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release # Allowed values: n, where n > 0 @@ -78,8 +78,8 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerMax driver v2.1.0 - image: dellemc/csi-powermax:v2.1.0 + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. # Allowed values: # Always: Always pull the image. @@ -136,6 +136,16 @@ spec: # default values: None - name: X_CSI_GRPC_MAX_THREADS value: "4" + + controller: + envs: + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin- volume usage, volume condition + # 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" node: envs: # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the driver is going to configure @@ -148,6 +158,20 @@ spec: # Default value: "false" - name: X_CSI_POWERMAX_ISCSI_ENABLE_CHAP value: "false" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin- volume usage, volume condition + # 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" + + sideCars: + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for controller plugin. + # Also set the env variable node.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for node plugin. + #- name: external-health-monitor + # args: ["--monitor-interval=300s"] --- apiVersion: v1 kind: ConfigMap diff --git a/samples/powermax_v170_k8s_119.yaml b/samples/powermax_v170_k8s_119.yaml deleted file mode 100644 index e1b2f88..0000000 --- a/samples/powermax_v170_k8s_119.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIPowerMax -metadata: - name: test-powermax - namespace: test-powermax -spec: - driver: - # Config version for CSI PowerMax v1.7 driver - configVersion: v6 - # Controller count. Don't increase it - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - # Image for CSI PowerMax driver v1.7 - image: dellemc/csi-powermax:v1.7.0 - imagePullPolicy: IfNotPresent - envs: - # list of arrays - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # Unisphere IP - # If using PowerMax reverseproxy, leave it unchanged - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" - # Change this to a 3 character prefix unique for this cluster - - name: X_CSI_K8S_CLUSTER_PREFIX - value: "XYZ" - # Add a list of comma separated port groups (only for ISCSI) - - name: "X_CSI_POWERMAX_PORTGROUPS" - value: "" - # Preferred transport protocol (FC/ISCSI) - - name: "X_CSI_TRANSPORT_PROTOCOL" - value: "" - # Set this to "powermax-reverseproxy" if you are installing the proxy - - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" - value: "" - # Set this value to a higher number (max 50) if you are using the proxy - - name: "X_CSI_GRPC_MAX_THREADS" - value: "4" - node: - envs: - # Enable ISCSI CHAP Authentication - - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" - value: "false" \ No newline at end of file diff --git a/samples/powermax_v170_k8s_120.yaml b/samples/powermax_v170_k8s_120.yaml deleted file mode 100644 index 125007a..0000000 --- a/samples/powermax_v170_k8s_120.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIPowerMax -metadata: - name: test-powermax - namespace: test-powermax -spec: - driver: - # Config version for CSI PowerMax v1.7 driver - configVersion: v6 - # Controller count. Don't increase it - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - # Image for CSI PowerMax driver v1.7 - image: dellemc/csi-powermax:v1.7.0 - imagePullPolicy: IfNotPresent - envs: - # list of arrays - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # Unisphere IP - # If using PowerMax reverseproxy, leave it unchanged - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" - # Change this to a 3 character prefix unique for this cluster - - name: X_CSI_K8S_CLUSTER_PREFIX - value: "XYZ" - # Add a list of comma separated port groups (only for ISCSI) - - name: "X_CSI_POWERMAX_PORTGROUPS" - value: "" - # Preferred transport protocol (FC/ISCSI) - - name: "X_CSI_TRANSPORT_PROTOCOL" - value: "" - # Set this to "powermax-reverseproxy" if you are installing the proxy - - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" - value: "" - # Set this value to a higher number (max 50) if you are using the proxy - - name: "X_CSI_GRPC_MAX_THREADS" - value: "4" - node: - envs: - # Enable ISCSI CHAP Authentication - - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" - value: "false" \ No newline at end of file diff --git a/samples/powermax_v170_k8s_121.yaml b/samples/powermax_v170_k8s_121.yaml deleted file mode 100644 index e1b2f88..0000000 --- a/samples/powermax_v170_k8s_121.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIPowerMax -metadata: - name: test-powermax - namespace: test-powermax -spec: - driver: - # Config version for CSI PowerMax v1.7 driver - configVersion: v6 - # Controller count. Don't increase it - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - # Image for CSI PowerMax driver v1.7 - image: dellemc/csi-powermax:v1.7.0 - imagePullPolicy: IfNotPresent - envs: - # list of arrays - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # Unisphere IP - # If using PowerMax reverseproxy, leave it unchanged - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" - # Change this to a 3 character prefix unique for this cluster - - name: X_CSI_K8S_CLUSTER_PREFIX - value: "XYZ" - # Add a list of comma separated port groups (only for ISCSI) - - name: "X_CSI_POWERMAX_PORTGROUPS" - value: "" - # Preferred transport protocol (FC/ISCSI) - - name: "X_CSI_TRANSPORT_PROTOCOL" - value: "" - # Set this to "powermax-reverseproxy" if you are installing the proxy - - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" - value: "" - # Set this value to a higher number (max 50) if you are using the proxy - - name: "X_CSI_GRPC_MAX_THREADS" - value: "4" - node: - envs: - # Enable ISCSI CHAP Authentication - - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" - value: "false" \ No newline at end of file diff --git a/samples/powermax_v170_ops_46.yaml b/samples/powermax_v170_ops_46.yaml deleted file mode 100644 index e1b2f88..0000000 --- a/samples/powermax_v170_ops_46.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIPowerMax -metadata: - name: test-powermax - namespace: test-powermax -spec: - driver: - # Config version for CSI PowerMax v1.7 driver - configVersion: v6 - # Controller count. Don't increase it - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - # Image for CSI PowerMax driver v1.7 - image: dellemc/csi-powermax:v1.7.0 - imagePullPolicy: IfNotPresent - envs: - # list of arrays - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # Unisphere IP - # If using PowerMax reverseproxy, leave it unchanged - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" - # Change this to a 3 character prefix unique for this cluster - - name: X_CSI_K8S_CLUSTER_PREFIX - value: "XYZ" - # Add a list of comma separated port groups (only for ISCSI) - - name: "X_CSI_POWERMAX_PORTGROUPS" - value: "" - # Preferred transport protocol (FC/ISCSI) - - name: "X_CSI_TRANSPORT_PROTOCOL" - value: "" - # Set this to "powermax-reverseproxy" if you are installing the proxy - - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" - value: "" - # Set this value to a higher number (max 50) if you are using the proxy - - name: "X_CSI_GRPC_MAX_THREADS" - value: "4" - node: - envs: - # Enable ISCSI CHAP Authentication - - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" - value: "false" \ No newline at end of file diff --git a/samples/powermax_v170_ops_47.yaml b/samples/powermax_v170_ops_47.yaml deleted file mode 100644 index 8058f51..0000000 --- a/samples/powermax_v170_ops_47.yaml +++ /dev/null @@ -1,45 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIPowerMax -metadata: - name: test-powermax - namespace: test-powermax -spec: - driver: - # Config version for CSI PowerMax v1.7 driver - configVersion: v6 - # Controller count. Don't increase it - replicas: 2 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - # Image for CSI PowerMax driver v1.7 - image: dellemc/csi-powermax:v1.7.0 - imagePullPolicy: IfNotPresent - envs: - # list of arrays - - name: X_CSI_MANAGED_ARRAYS - value: "000000000000,000000000001" - # Unisphere IP - # If using PowerMax reverseproxy, leave it unchanged - - name: X_CSI_POWERMAX_ENDPOINT - value: "https://0.0.0.0:8443/" - # Change this to a 3 character prefix unique for this cluster - - name: X_CSI_K8S_CLUSTER_PREFIX - value: "XYZ" - # Add a list of comma separated port groups (only for ISCSI) - - name: "X_CSI_POWERMAX_PORTGROUPS" - value: "" - # Preferred transport protocol (FC/ISCSI) - - name: "X_CSI_TRANSPORT_PROTOCOL" - value: "" - # Set this to "powermax-reverseproxy" if you are installing the proxy - - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" - value: "" - # Set this value to a higher number (max 50) if you are using the proxy - - name: "X_CSI_GRPC_MAX_THREADS" - value: "4" - node: - envs: - # Enable ISCSI CHAP Authentication - - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" - value: "false" \ No newline at end of file diff --git a/samples/powermax_v220_k8s_121.yaml b/samples/powermax_v220_k8s_121.yaml new file mode 100644 index 0000000..0a9a77a --- /dev/null +++ b/samples/powermax_v220_k8s_121.yaml @@ -0,0 +1,122 @@ +apiVersion: storage.dell.com/v1 +kind: CSIPowerMax +metadata: + name: test-powermax + namespace: test-powermax +spec: + driver: + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 + # replica: Define the number of PowerMax controller nodes + # to deploy to the Kubernetes release + # Allowed values: n, where n > 0 + # Default value: None + replicas: 2 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 + # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. + # Allowed values: + # Always: Always pull the image. + # IfNotPresent: Only pull the image if it does not already exist on the node. + # Never: Never pull the image. + # Default value: None + imagePullPolicy: IfNotPresent + envs: + # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning + # Default value: None + # Examples: "000000000001", "000000000002" + - name: X_CSI_MANAGED_ARRAYS + value: "000000000000,000000000001" + # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays + # Default value: None + # Example: https://0.0.0.1:8443 + - name: X_CSI_POWERMAX_ENDPOINT + value: "https://0.0.0.0:8443/" + # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto + # all resources created in the Array + # This should be unique per K8s/CSI deployment + # maximum length of this value is 3 characters + # Default value: None + # Examples: "XYZ", "EMC" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "XYZ" + # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. + # It is a comma separated list of portgroup names. + # Required only in case of iSCSI port groups + # Allowed values: iSCSI Port Group names + # Default value: None + # Examples: "pg1", "pg1, pg2" + - name: "X_CSI_POWERMAX_PORTGROUPS" + value: "" + # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, + # "ISCSI" for iSCSI, or "" for autoselection. + # Allowed values: + # "FC" - Fiber Channel protocol + # "FIBER" - Fiber Channel protocol + # "ISCSI" - iSCSI protocol + # "" - Automatic selection of transport protocol + # Default value: "" + - name: "X_CSI_TRANSPORT_PROTOCOL" + value: "" + # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes + # Set this to "powermax-reverseproxy" if you are installing the proxy + # Allowed values: "powermax-reverseproxy" + # default values: "" + - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" + value: "" + # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests. + # Set this value to a higher number (max 50) if you are using the proxy + # Allowed values: n, where n > 4 + # default values: None + - name: "X_CSI_GRPC_MAX_THREADS" + value: "4" + + sideCars: + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for controller plugin. + # Also set the env variable node.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for node plugin. + #- name: external-health-monitor + # args: ["--monitor-interval=300s"] + + controller: + envs: + # X_CSI_HEALTH_MONITOR_ENABLED: Determines if the controller plugin will monitor health of CSI volumes- 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" + node: + envs: + # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the node plugin is going to configure + # ISCSI node databases on the nodes with the CHAP credentials + # If enabled, the CHAP secret must be provided in the credentials secret + # and set to the key "chapsecret" + # Allowed values: + # "true" - CHAP is enabled + # "false" - CHAP is disabled + # Default value: "false" + - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" + value: "false" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin- volume usage, volume condition + # 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" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: powermax-config-params + namespace: test-powermax +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/samples/powermax_v220_k8s_122.yaml b/samples/powermax_v220_k8s_122.yaml new file mode 100644 index 0000000..0a9a77a --- /dev/null +++ b/samples/powermax_v220_k8s_122.yaml @@ -0,0 +1,122 @@ +apiVersion: storage.dell.com/v1 +kind: CSIPowerMax +metadata: + name: test-powermax + namespace: test-powermax +spec: + driver: + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 + # replica: Define the number of PowerMax controller nodes + # to deploy to the Kubernetes release + # Allowed values: n, where n > 0 + # Default value: None + replicas: 2 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 + # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. + # Allowed values: + # Always: Always pull the image. + # IfNotPresent: Only pull the image if it does not already exist on the node. + # Never: Never pull the image. + # Default value: None + imagePullPolicy: IfNotPresent + envs: + # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning + # Default value: None + # Examples: "000000000001", "000000000002" + - name: X_CSI_MANAGED_ARRAYS + value: "000000000000,000000000001" + # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays + # Default value: None + # Example: https://0.0.0.1:8443 + - name: X_CSI_POWERMAX_ENDPOINT + value: "https://0.0.0.0:8443/" + # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto + # all resources created in the Array + # This should be unique per K8s/CSI deployment + # maximum length of this value is 3 characters + # Default value: None + # Examples: "XYZ", "EMC" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "XYZ" + # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. + # It is a comma separated list of portgroup names. + # Required only in case of iSCSI port groups + # Allowed values: iSCSI Port Group names + # Default value: None + # Examples: "pg1", "pg1, pg2" + - name: "X_CSI_POWERMAX_PORTGROUPS" + value: "" + # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, + # "ISCSI" for iSCSI, or "" for autoselection. + # Allowed values: + # "FC" - Fiber Channel protocol + # "FIBER" - Fiber Channel protocol + # "ISCSI" - iSCSI protocol + # "" - Automatic selection of transport protocol + # Default value: "" + - name: "X_CSI_TRANSPORT_PROTOCOL" + value: "" + # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes + # Set this to "powermax-reverseproxy" if you are installing the proxy + # Allowed values: "powermax-reverseproxy" + # default values: "" + - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" + value: "" + # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests. + # Set this value to a higher number (max 50) if you are using the proxy + # Allowed values: n, where n > 4 + # default values: None + - name: "X_CSI_GRPC_MAX_THREADS" + value: "4" + + sideCars: + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for controller plugin. + # Also set the env variable node.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for node plugin. + #- name: external-health-monitor + # args: ["--monitor-interval=300s"] + + controller: + envs: + # X_CSI_HEALTH_MONITOR_ENABLED: Determines if the controller plugin will monitor health of CSI volumes- 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" + node: + envs: + # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the node plugin is going to configure + # ISCSI node databases on the nodes with the CHAP credentials + # If enabled, the CHAP secret must be provided in the credentials secret + # and set to the key "chapsecret" + # Allowed values: + # "true" - CHAP is enabled + # "false" - CHAP is disabled + # Default value: "false" + - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" + value: "false" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin- volume usage, volume condition + # 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" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: powermax-config-params + namespace: test-powermax +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/samples/powermax_v220_k8s_123.yaml b/samples/powermax_v220_k8s_123.yaml new file mode 100644 index 0000000..0a9a77a --- /dev/null +++ b/samples/powermax_v220_k8s_123.yaml @@ -0,0 +1,122 @@ +apiVersion: storage.dell.com/v1 +kind: CSIPowerMax +metadata: + name: test-powermax + namespace: test-powermax +spec: + driver: + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 + # replica: Define the number of PowerMax controller nodes + # to deploy to the Kubernetes release + # Allowed values: n, where n > 0 + # Default value: None + replicas: 2 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 + # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. + # Allowed values: + # Always: Always pull the image. + # IfNotPresent: Only pull the image if it does not already exist on the node. + # Never: Never pull the image. + # Default value: None + imagePullPolicy: IfNotPresent + envs: + # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning + # Default value: None + # Examples: "000000000001", "000000000002" + - name: X_CSI_MANAGED_ARRAYS + value: "000000000000,000000000001" + # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays + # Default value: None + # Example: https://0.0.0.1:8443 + - name: X_CSI_POWERMAX_ENDPOINT + value: "https://0.0.0.0:8443/" + # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto + # all resources created in the Array + # This should be unique per K8s/CSI deployment + # maximum length of this value is 3 characters + # Default value: None + # Examples: "XYZ", "EMC" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "XYZ" + # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. + # It is a comma separated list of portgroup names. + # Required only in case of iSCSI port groups + # Allowed values: iSCSI Port Group names + # Default value: None + # Examples: "pg1", "pg1, pg2" + - name: "X_CSI_POWERMAX_PORTGROUPS" + value: "" + # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, + # "ISCSI" for iSCSI, or "" for autoselection. + # Allowed values: + # "FC" - Fiber Channel protocol + # "FIBER" - Fiber Channel protocol + # "ISCSI" - iSCSI protocol + # "" - Automatic selection of transport protocol + # Default value: "" + - name: "X_CSI_TRANSPORT_PROTOCOL" + value: "" + # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes + # Set this to "powermax-reverseproxy" if you are installing the proxy + # Allowed values: "powermax-reverseproxy" + # default values: "" + - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" + value: "" + # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests. + # Set this value to a higher number (max 50) if you are using the proxy + # Allowed values: n, where n > 4 + # default values: None + - name: "X_CSI_GRPC_MAX_THREADS" + value: "4" + + sideCars: + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for controller plugin. + # Also set the env variable node.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true" for node plugin. + #- name: external-health-monitor + # args: ["--monitor-interval=300s"] + + controller: + envs: + # X_CSI_HEALTH_MONITOR_ENABLED: Determines if the controller plugin will monitor health of CSI volumes- 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" + node: + envs: + # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the node plugin is going to configure + # ISCSI node databases on the nodes with the CHAP credentials + # If enabled, the CHAP secret must be provided in the credentials secret + # and set to the key "chapsecret" + # Allowed values: + # "true" - CHAP is enabled + # "false" - CHAP is disabled + # Default value: "false" + - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" + value: "false" + # X_CSI_HEALTH_MONITOR_ENABLED: Enable/Disable health monitor of CSI volumes from node plugin- volume usage, volume condition + # 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" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: powermax-config-params + namespace: test-powermax +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/samples/powermax_v220_ops_48.yaml b/samples/powermax_v220_ops_48.yaml new file mode 100644 index 0000000..536a8cb --- /dev/null +++ b/samples/powermax_v220_ops_48.yaml @@ -0,0 +1,98 @@ +apiVersion: storage.dell.com/v1 +kind: CSIPowerMax +metadata: + name: test-powermax + namespace: test-powermax +spec: + driver: + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 + # replica: Define the number of PowerMax controller nodes + # to deploy to the Kubernetes release + # Allowed values: n, where n > 0 + # Default value: None + replicas: 2 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 + # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. + # Allowed values: + # Always: Always pull the image. + # IfNotPresent: Only pull the image if it does not already exist on the node. + # Never: Never pull the image. + # Default value: None + imagePullPolicy: IfNotPresent + envs: + # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning + # Default value: None + # Examples: "000000000001", "000000000002" + - name: X_CSI_MANAGED_ARRAYS + value: "000000000000,000000000001" + # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays + # Default value: None + # Example: https://0.0.0.1:8443 + - name: X_CSI_POWERMAX_ENDPOINT + value: "https://0.0.0.0:8443/" + # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto + # all resources created in the Array + # This should be unique per K8s/CSI deployment + # maximum length of this value is 3 characters + # Default value: None + # Examples: "XYZ", "EMC" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "XYZ" + # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. + # It is a comma separated list of portgroup names. + # Required only in case of iSCSI port groups + # Allowed values: iSCSI Port Group names + # Default value: None + # Examples: "pg1", "pg1, pg2" + - name: "X_CSI_POWERMAX_PORTGROUPS" + value: "" + # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, + # "ISCSI" for iSCSI, or "" for autoselection. + # Allowed values: + # "FC" - Fiber Channel protocol + # "FIBER" - Fiber Channel protocol + # "ISCSI" - iSCSI protocol + # "" - Automatic selection of transport protocol + # Default value: "" + - name: "X_CSI_TRANSPORT_PROTOCOL" + value: "" + # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes + # Set this to "powermax-reverseproxy" if you are installing the proxy + # Allowed values: "powermax-reverseproxy" + # default values: "" + - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" + value: "" + # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests. + # Set this value to a higher number (max 50) if you are using the proxy + # Allowed values: n, where n > 4 + # default values: None + - name: "X_CSI_GRPC_MAX_THREADS" + value: "4" + + node: + envs: + # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the driver is going to configure + # ISCSI node databases on the nodes with the CHAP credentials + # If enabled, the CHAP secret must be provided in the credentials secret + # and set to the key "chapsecret" + # Allowed values: + # "true" - CHAP is enabled + # "false" - CHAP is disabled + # Default value: "false" + - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" + value: "false" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: powermax-config-params + namespace: test-powermax +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/samples/powermax_v220_ops_49.yaml b/samples/powermax_v220_ops_49.yaml new file mode 100644 index 0000000..536a8cb --- /dev/null +++ b/samples/powermax_v220_ops_49.yaml @@ -0,0 +1,98 @@ +apiVersion: storage.dell.com/v1 +kind: CSIPowerMax +metadata: + name: test-powermax + namespace: test-powermax +spec: + driver: + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 + # replica: Define the number of PowerMax controller nodes + # to deploy to the Kubernetes release + # Allowed values: n, where n > 0 + # Default value: None + replicas: 2 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + # Image for CSI PowerMax driver v2.2.0 + image: dellemc/csi-powermax:v2.2.0 + # imagePullPolicy: Policy to determine if the image should be pulled prior to starting the container. + # Allowed values: + # Always: Always pull the image. + # IfNotPresent: Only pull the image if it does not already exist on the node. + # Never: Never pull the image. + # Default value: None + imagePullPolicy: IfNotPresent + envs: + # X_CSI_MANAGED_ARRAYS: Serial ID of the arrays that will be used for provisioning + # Default value: None + # Examples: "000000000001", "000000000002" + - name: X_CSI_MANAGED_ARRAYS + value: "000000000000,000000000001" + # X_CSI_POWERMAX_ENDPOINT: Address of the Unisphere server that is managing the PowerMax arrays + # Default value: None + # Example: https://0.0.0.1:8443 + - name: X_CSI_POWERMAX_ENDPOINT + value: "https://0.0.0.0:8443/" + # X_CSI_K8S_CLUSTER_PREFIX: Define a prefix that is appended onto + # all resources created in the Array + # This should be unique per K8s/CSI deployment + # maximum length of this value is 3 characters + # Default value: None + # Examples: "XYZ", "EMC" + - name: X_CSI_K8S_CLUSTER_PREFIX + value: "XYZ" + # X_CSI_POWERMAX_PORTGROUPS: Define the set of existing port groups that the driver will use. + # It is a comma separated list of portgroup names. + # Required only in case of iSCSI port groups + # Allowed values: iSCSI Port Group names + # Default value: None + # Examples: "pg1", "pg1, pg2" + - name: "X_CSI_POWERMAX_PORTGROUPS" + value: "" + # "X_CSI_TRANSPORT_PROTOCOL" can be "FC" or "FIBRE" for fibrechannel, + # "ISCSI" for iSCSI, or "" for autoselection. + # Allowed values: + # "FC" - Fiber Channel protocol + # "FIBER" - Fiber Channel protocol + # "ISCSI" - iSCSI protocol + # "" - Automatic selection of transport protocol + # Default value: "" + - name: "X_CSI_TRANSPORT_PROTOCOL" + value: "" + # X_CSI_POWERMAX_PROXY_SERVICE_NAME: Refers to the name of the proxy service in kubernetes + # Set this to "powermax-reverseproxy" if you are installing the proxy + # Allowed values: "powermax-reverseproxy" + # default values: "" + - name: "X_CSI_POWERMAX_PROXY_SERVICE_NAME" + value: "" + # X_CSI_GRPC_MAX_THREADS: Defines the maximum number of concurrent grpc requests. + # Set this value to a higher number (max 50) if you are using the proxy + # Allowed values: n, where n > 4 + # default values: None + - name: "X_CSI_GRPC_MAX_THREADS" + value: "4" + + node: + envs: + # X_CSI_POWERMAX_ISCSI_ENABLE_CHAP: Determine if the driver is going to configure + # ISCSI node databases on the nodes with the CHAP credentials + # If enabled, the CHAP secret must be provided in the credentials secret + # and set to the key "chapsecret" + # Allowed values: + # "true" - CHAP is enabled + # "false" - CHAP is disabled + # Default value: "false" + - name: "X_CSI_POWERMAX_ISCSI_ENABLE_CHAP" + value: "false" +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: powermax-config-params + namespace: test-powermax +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "JSON" \ No newline at end of file diff --git a/samples/powerstore_v220_k8s_121.yaml b/samples/powerstore_v220_k8s_121.yaml index 0a83496..3ba9c0b 100644 --- a/samples/powerstore_v220_k8s_121.yaml +++ b/samples/powerstore_v220_k8s_121.yaml @@ -36,6 +36,25 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" + + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" node: envs: @@ -50,6 +69,26 @@ 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/worker: "" + nodeSelector: + # node-role.kubernetes.io/worker: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/worker" + # operator: "Exists" + # effect: "NoSchedule" + --- apiVersion: v1 kind: ConfigMap diff --git a/samples/powerstore_v220_k8s_122.yaml b/samples/powerstore_v220_k8s_122.yaml index 0a83496..622db80 100644 --- a/samples/powerstore_v220_k8s_122.yaml +++ b/samples/powerstore_v220_k8s_122.yaml @@ -36,6 +36,25 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" + + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" node: envs: @@ -50,6 +69,26 @@ 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/worker: "" + nodeSelector: + # node-role.kubernetes.io/worker: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/worker" + # operator: "Exists" + # effect: "NoSchedule" + --- apiVersion: v1 kind: ConfigMap diff --git a/samples/powerstore_v220_k8s_123.yaml b/samples/powerstore_v220_k8s_123.yaml index 0a83496..6846f77 100644 --- a/samples/powerstore_v220_k8s_123.yaml +++ b/samples/powerstore_v220_k8s_123.yaml @@ -36,6 +36,25 @@ spec: # Default value: false - name: X_CSI_HEALTH_MONITOR_ENABLED value: "false" + + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" node: envs: @@ -50,6 +69,26 @@ 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/worker: "" + nodeSelector: + # node-role.kubernetes.io/worker: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/worker" + # operator: "Exists" + # effect: "NoSchedule" + --- apiVersion: v1 kind: ConfigMap diff --git a/samples/powerstore_v220_ops_48.yaml b/samples/powerstore_v220_ops_48.yaml index 8a5e1b1..fe087a2 100644 --- a/samples/powerstore_v220_ops_48.yaml +++ b/samples/powerstore_v220_ops_48.yaml @@ -20,12 +20,51 @@ spec: value: "csi" - name: X_CSI_FC_PORTS_FILTER_FILE_PATH value: "/etc/fc-ports-filter" + controller: + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" node: envs: # Set to "true" to enable ISCSI CHAP Authentication # CHAP password will be autogenerated by driver - name: "X_CSI_POWERSTORE_ENABLE_CHAP" value: "true" + + # 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 + # Examples: + # node-role.kubernetes.io/worker: "" + nodeSelector: + # node-role.kubernetes.io/worker: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/worker" + # operator: "Exists" + # effect: "NoSchedule" + --- apiVersion: v1 kind: ConfigMap diff --git a/samples/powerstore_v220_ops_49.yaml b/samples/powerstore_v220_ops_49.yaml index 8a5e1b1..0790245 100644 --- a/samples/powerstore_v220_ops_49.yaml +++ b/samples/powerstore_v220_ops_49.yaml @@ -20,12 +20,51 @@ spec: value: "csi" - name: X_CSI_FC_PORTS_FILTER_FILE_PATH value: "/etc/fc-ports-filter" + controller: + # 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. + # Leave as blank to consider all nodes + # Allowed values: map of key-value pairs + # Default value: None + # Examples: + # node-role.kubernetes.io/master: "" + nodeSelector: + # node-role.kubernetes.io/master: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/master" + # operator: "Exists" + # effect: "NoSchedule" node: envs: # Set to "true" to enable ISCSI CHAP Authentication # CHAP password will be autogenerated by driver - name: "X_CSI_POWERSTORE_ENABLE_CHAP" value: "true" + + # 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 + # Examples: + # node-role.kubernetes.io/worker: "" + nodeSelector: + # node-role.kubernetes.io/worker: "" + + # tolerations: Define tolerations for the controllers, if required. + # Leave as blank to install controller on worker nodes + # Default value: None + tolerations: + # - key: "node-role.kubernetes.io/worker" + # operator: "Exists" + # effect: "NoSchedule" + --- apiVersion: v1 kind: ConfigMap diff --git a/samples/unity_v220_k8s_121.yaml b/samples/unity_v220_k8s_121.yaml index 3605eca..9afd23f 100644 --- a/samples/unity_v220_k8s_121.yaml +++ b/samples/unity_v220_k8s_121.yaml @@ -53,5 +53,5 @@ data: CSI_LOG_LEVEL: "info" ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: "0" - SYNC_NODE_INFO_TIME_INTERVAL: "0" + SYNC_NODE_INFO_TIME_INTERVAL: "15" TENANT_NAME: "" diff --git a/samples/unity_v220_k8s_122.yaml b/samples/unity_v220_k8s_122.yaml index ee40966..f8fe1e7 100644 --- a/samples/unity_v220_k8s_122.yaml +++ b/samples/unity_v220_k8s_122.yaml @@ -53,6 +53,6 @@ data: CSI_LOG_LEVEL: "info" ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: "0" - SYNC_NODE_INFO_TIME_INTERVAL: "0" + SYNC_NODE_INFO_TIME_INTERVAL: "15" TENANT_NAME: "" diff --git a/samples/unity_v220_k8s_123.yaml b/samples/unity_v220_k8s_123.yaml index ee40966..f8fe1e7 100644 --- a/samples/unity_v220_k8s_123.yaml +++ b/samples/unity_v220_k8s_123.yaml @@ -53,6 +53,6 @@ data: CSI_LOG_LEVEL: "info" ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: "0" - SYNC_NODE_INFO_TIME_INTERVAL: "0" + SYNC_NODE_INFO_TIME_INTERVAL: "15" TENANT_NAME: "" diff --git a/samples/unity_v220_ops_48.yaml b/samples/unity_v220_ops_48.yaml index c3c9b3d..3c41bf6 100644 --- a/samples/unity_v220_ops_48.yaml +++ b/samples/unity_v220_ops_48.yaml @@ -28,5 +28,5 @@ data: CSI_LOG_LEVEL: "info" ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: "0" - SYNC_NODE_INFO_TIME_INTERVAL: "0" + SYNC_NODE_INFO_TIME_INTERVAL: "15" TENANT_NAME: "" diff --git a/samples/unity_v220_ops_49.yaml b/samples/unity_v220_ops_49.yaml index c3c9b3d..3c41bf6 100644 --- a/samples/unity_v220_ops_49.yaml +++ b/samples/unity_v220_ops_49.yaml @@ -28,5 +28,5 @@ data: CSI_LOG_LEVEL: "info" ALLOW_RWO_MULTIPOD_ACCESS: "false" MAX_UNITY_VOLUMES_PER_NODE: "0" - SYNC_NODE_INFO_TIME_INTERVAL: "0" + SYNC_NODE_INFO_TIME_INTERVAL: "15" TENANT_NAME: "" diff --git a/samples/vxflex_150_k8s_121.yaml b/samples/vxflex_150_k8s_121.yaml deleted file mode 100644 index ffa8ab5..0000000 --- a/samples/vxflex_150_k8s_121.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIVXFlexOS -metadata: - name: test-vxflexos - namespace: test-vxflexos -spec: - driver: - configVersion: v5 - replicas: 1 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - image: "dellemc/csi-vxflexos:v1.5.0" - imagePullPolicy: IfNotPresent - envs: - - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT - value: "false" - - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE - value: "false" - - name: X_CSI_DEBUG - value: "true" - - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS - value: "false" - #sideCars: - # Uncomment the following section if you want to run the monitoring sidecar - # - name: sdc-monitor - # envs: - # - name: HOST_PID - # value: "1" - # - name: MDM - # value: "" - initContainers: - - image: dellemc/sdc:3.5.1.1-1 - imagePullPolicy: IfNotPresent - name: sdc - envs: - - name: MDM - value: "10.x.x.x,10.x.x.x" diff --git a/samples/vxflex_150_ops_46.yaml b/samples/vxflex_150_ops_46.yaml deleted file mode 100644 index ffa8ab5..0000000 --- a/samples/vxflex_150_ops_46.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIVXFlexOS -metadata: - name: test-vxflexos - namespace: test-vxflexos -spec: - driver: - configVersion: v5 - replicas: 1 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - image: "dellemc/csi-vxflexos:v1.5.0" - imagePullPolicy: IfNotPresent - envs: - - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT - value: "false" - - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE - value: "false" - - name: X_CSI_DEBUG - value: "true" - - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS - value: "false" - #sideCars: - # Uncomment the following section if you want to run the monitoring sidecar - # - name: sdc-monitor - # envs: - # - name: HOST_PID - # value: "1" - # - name: MDM - # value: "" - initContainers: - - image: dellemc/sdc:3.5.1.1-1 - imagePullPolicy: IfNotPresent - name: sdc - envs: - - name: MDM - value: "10.x.x.x,10.x.x.x" diff --git a/samples/vxflex_150_ops_47.yaml b/samples/vxflex_150_ops_47.yaml deleted file mode 100644 index ffa8ab5..0000000 --- a/samples/vxflex_150_ops_47.yaml +++ /dev/null @@ -1,38 +0,0 @@ -apiVersion: storage.dell.com/v1 -kind: CSIVXFlexOS -metadata: - name: test-vxflexos - namespace: test-vxflexos -spec: - driver: - configVersion: v5 - replicas: 1 - dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false - common: - image: "dellemc/csi-vxflexos:v1.5.0" - imagePullPolicy: IfNotPresent - envs: - - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT - value: "false" - - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE - value: "false" - - name: X_CSI_DEBUG - value: "true" - - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS - value: "false" - #sideCars: - # Uncomment the following section if you want to run the monitoring sidecar - # - name: sdc-monitor - # envs: - # - name: HOST_PID - # value: "1" - # - name: MDM - # value: "" - initContainers: - - image: dellemc/sdc:3.5.1.1-1 - imagePullPolicy: IfNotPresent - name: sdc - envs: - - name: MDM - value: "10.x.x.x,10.x.x.x" diff --git a/samples/vxflex_v220_k8s_121.yaml b/samples/vxflex_v220_k8s_121.yaml new file mode 100644 index 0000000..22e7a13 --- /dev/null +++ b/samples/vxflex_v220_k8s_121.yaml @@ -0,0 +1,76 @@ +apiVersion: storage.dell.com/v1 +kind: CSIVXFlexOS +metadata: + name: test-vxflexos + namespace: test-vxflexos +spec: + driver: + configVersion: v2.2.0 + replicas: 1 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + image: "dellemc/csi-vxflexos:v2.2.0" + imagePullPolicy: IfNotPresent + envs: + - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT + value: "false" + - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE + value: "false" + - name: X_CSI_DEBUG + value: "true" + - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS + value: "false" + sideCars: + # comment the following section if you don't want to run the monitoring sidecar + - name: sdc-monitor + envs: + - name: HOST_PID + value: "1" + - name: MDM + value: "" + + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # - name: external-health-monitor + # args: ["--monitor-interval=60s"] + + 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" + + 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" + + initContainers: + - image: dellemc/sdc:3.6 + imagePullPolicy: IfNotPresent + name: sdc + envs: + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vxflexos-config-params + namespace: test-vxflexos +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" diff --git a/samples/vxflex_v220_k8s_122.yaml b/samples/vxflex_v220_k8s_122.yaml new file mode 100644 index 0000000..22e7a13 --- /dev/null +++ b/samples/vxflex_v220_k8s_122.yaml @@ -0,0 +1,76 @@ +apiVersion: storage.dell.com/v1 +kind: CSIVXFlexOS +metadata: + name: test-vxflexos + namespace: test-vxflexos +spec: + driver: + configVersion: v2.2.0 + replicas: 1 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + image: "dellemc/csi-vxflexos:v2.2.0" + imagePullPolicy: IfNotPresent + envs: + - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT + value: "false" + - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE + value: "false" + - name: X_CSI_DEBUG + value: "true" + - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS + value: "false" + sideCars: + # comment the following section if you don't want to run the monitoring sidecar + - name: sdc-monitor + envs: + - name: HOST_PID + value: "1" + - name: MDM + value: "" + + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # - name: external-health-monitor + # args: ["--monitor-interval=60s"] + + 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" + + 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" + + initContainers: + - image: dellemc/sdc:3.6 + imagePullPolicy: IfNotPresent + name: sdc + envs: + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vxflexos-config-params + namespace: test-vxflexos +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" diff --git a/samples/vxflex_v220_k8s_123.yaml b/samples/vxflex_v220_k8s_123.yaml new file mode 100644 index 0000000..22e7a13 --- /dev/null +++ b/samples/vxflex_v220_k8s_123.yaml @@ -0,0 +1,76 @@ +apiVersion: storage.dell.com/v1 +kind: CSIVXFlexOS +metadata: + name: test-vxflexos + namespace: test-vxflexos +spec: + driver: + configVersion: v2.2.0 + replicas: 1 + dnsPolicy: ClusterFirstWithHostNet + forceUpdate: false + common: + image: "dellemc/csi-vxflexos:v2.2.0" + imagePullPolicy: IfNotPresent + envs: + - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT + value: "false" + - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE + value: "false" + - name: X_CSI_DEBUG + value: "true" + - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS + value: "false" + sideCars: + # comment the following section if you don't want to run the monitoring sidecar + - name: sdc-monitor + envs: + - name: HOST_PID + value: "1" + - name: MDM + value: "" + + # Uncomment the following to install 'external-health-monitor' sidecar to enable health monitor of CSI volumes from Controller plugin. + # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # - name: external-health-monitor + # args: ["--monitor-interval=60s"] + + 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" + + 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" + + initContainers: + - image: dellemc/sdc:3.6 + imagePullPolicy: IfNotPresent + name: sdc + envs: + - name: MDM + value: "10.xx.xx.xx,10.xx.xx.xx" #provide MDM value + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vxflexos-config-params + namespace: test-vxflexos +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" diff --git a/samples/vxflex_150_k8s_120.yaml b/samples/vxflex_v220_ops_48.yaml similarity index 58% rename from samples/vxflex_150_k8s_120.yaml rename to samples/vxflex_v220_ops_48.yaml index f832270..eacf12b 100644 --- a/samples/vxflex_150_k8s_120.yaml +++ b/samples/vxflex_v220_ops_48.yaml @@ -5,12 +5,12 @@ metadata: namespace: test-vxflexos spec: driver: - configVersion: v5 + configVersion: v2.2.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - image: "dellemc/csi-vxflexos:v1.5.0" + image: "dellemc/csi-vxflexos:v2.2.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -21,18 +21,30 @@ spec: value: "true" - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS value: "false" - #sideCars: - # Uncomment the following section if you want to run the monitoring sidecar - # - name: sdc-monitor - # envs: - # - name: HOST_PID - # value: "1" - # - name: MDM - # value: "" + sideCars: + # Comment the following section if you don't want to run the monitoring sidecar + - name: sdc-monitor + envs: + - name: HOST_PID + value: "1" + - name: MDM + value: "" + initContainers: - - image: dellemc/sdc:3.5.1.1-1 + - image: dellemc/sdc:3.6 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM value: "10.x.x.x,10.x.x.x" #provide MDM value + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vxflexos-config-params + namespace: test-vxflexos +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" diff --git a/samples/vxflex_150_k8s_119.yaml b/samples/vxflex_v220_ops_49.yaml similarity index 53% rename from samples/vxflex_150_k8s_119.yaml rename to samples/vxflex_v220_ops_49.yaml index ffa8ab5..eacf12b 100644 --- a/samples/vxflex_150_k8s_119.yaml +++ b/samples/vxflex_v220_ops_49.yaml @@ -5,12 +5,12 @@ metadata: namespace: test-vxflexos spec: driver: - configVersion: v5 + configVersion: v2.2.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - image: "dellemc/csi-vxflexos:v1.5.0" + image: "dellemc/csi-vxflexos:v2.2.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT @@ -21,18 +21,30 @@ spec: value: "true" - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS value: "false" - #sideCars: - # Uncomment the following section if you want to run the monitoring sidecar - # - name: sdc-monitor - # envs: - # - name: HOST_PID - # value: "1" - # - name: MDM - # value: "" + sideCars: + # Comment the following section if you don't want to run the monitoring sidecar + - name: sdc-monitor + envs: + - name: HOST_PID + value: "1" + - name: MDM + value: "" + initContainers: - - image: dellemc/sdc:3.5.1.1-1 + - image: dellemc/sdc:3.6 imagePullPolicy: IfNotPresent name: sdc envs: - name: MDM - value: "10.x.x.x,10.x.x.x" + value: "10.x.x.x,10.x.x.x" #provide MDM value + +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: vxflexos-config-params + namespace: test-vxflexos +data: + driver-config-params.yaml: | + CSI_LOG_LEVEL: "debug" + CSI_LOG_FORMAT: "TEXT" diff --git a/scripts/install.sh b/scripts/install.sh index f1d76d1..4994c26 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -196,7 +196,7 @@ function install_or_update_driver_crd() { log step "Install/Update CRDs" kubectl apply -f ${DEPLOYDIR}/crds/storage.dell.com.crds.all.yaml 2>&1 >/dev/null if [ $? -ne 0 ]; then - log error "Failed to create cluster role binding for operator" + log error "Failed to install/update CRD" fi log step_success } @@ -228,7 +228,7 @@ function create_operator_deployment() { log step "Install Operator" kubectl apply -f ${DEPLOYDIR}/operator.yaml 2>&1 >/dev/null if [ $? -ne 0 ]; then - log error "Failed to create cluster role binding for operator" + log error "Failed to deploy operator" fi log step_success } diff --git a/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml b/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml index 9a455f6..fd9a3fd 100644 --- a/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml +++ b/test/testdata/csiisilon/01-simple-deployment/in-csiisilon.yaml @@ -66,6 +66,14 @@ spec: - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + # X_CSI_ISI_AUTH_TYPE: Indicates whether the authentication will be session-based or basic. + # Allowed values: + # 0: enables basic Authentication + # 1: enables session-based Authentication + # 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. diff --git a/test/testdata/csiisilon/01-simple-deployment/out-clusterrole-controller.yaml b/test/testdata/csiisilon/01-simple-deployment/out-clusterrole-controller.yaml index b0c7c76..94957a4 100644 --- a/test/testdata/csiisilon/01-simple-deployment/out-clusterrole-controller.yaml +++ b/test/testdata/csiisilon/01-simple-deployment/out-clusterrole-controller.yaml @@ -114,6 +114,7 @@ rules: - watch - update - delete + - patch - apiGroups: - snapshot.storage.k8s.io resources: @@ -129,6 +130,7 @@ rules: - volumesnapshotcontents/status verbs: - update + - patch - apiGroups: - snapshot.storage.k8s.io resources: diff --git a/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml b/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml index a9edc5c..77139c5 100644 --- a/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml +++ b/test/testdata/csiisilon/01-simple-deployment/out-csiisilon.yaml @@ -36,6 +36,8 @@ spec: value: "true" - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + - name: X_CSI_ISI_AUTH_TYPE + value: "0" - name: X_CSI_CUSTOM_TOPOLOGY_ENABLED value: "false" image: dellemc/csi-isilon:v2.2.0 diff --git a/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml b/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml index c3a2002..f1344cb 100644 --- a/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml +++ b/test/testdata/csiisilon/01-simple-deployment/out-daemonset.yaml @@ -33,6 +33,8 @@ spec: value: "true" - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + - name: X_CSI_ISI_AUTH_TYPE + value: "0" - name: X_CSI_NODE_NAME valueFrom: fieldRef: diff --git a/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml b/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml index 3c7a20f..a3137fc 100644 --- a/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml +++ b/test/testdata/csiisilon/01-simple-deployment/out-deployment.yaml @@ -43,6 +43,8 @@ spec: value: "true" - name: X_CSI_ISI_SKIP_CERTIFICATE_VALIDATION value: "true" + - name: X_CSI_ISI_AUTH_TYPE + value: "0" - name: X_CSI_NODE_NAME valueFrom: fieldRef: diff --git a/test/testdata/csipowermax/01-simple-deployment/in-csipowermax.yaml b/test/testdata/csipowermax/01-simple-deployment/in-csipowermax.yaml index 40080b3..4f0a70e 100644 --- a/test/testdata/csipowermax/01-simple-deployment/in-csipowermax.yaml +++ b/test/testdata/csipowermax/01-simple-deployment/in-csipowermax.yaml @@ -5,15 +5,15 @@ metadata: namespace: test-powermax spec: driver: - # Config version for CSI PowerMax v2.1.0 driver - configVersion: v2.1.0 + # Config version for CSI PowerMax v2.2.0 driver + configVersion: v2.2.0 # Controller count. Don't increase it replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerMax driver v2.1 - image: "dellemc/csi-powermax:v2.1.0.000R" + # Image for CSI PowerMax driver v2.2 + image: "dellemc/csi-powermax:v2.2.0.000R" imagePullPolicy: IfNotPresent envs: # Managed Arrays diff --git a/test/testdata/csipowermax/01-simple-deployment/out-clusterrole-controller.yaml b/test/testdata/csipowermax/01-simple-deployment/out-clusterrole-controller.yaml index 2f8d10a..58f50fe 100644 --- a/test/testdata/csipowermax/01-simple-deployment/out-clusterrole-controller.yaml +++ b/test/testdata/csipowermax/01-simple-deployment/out-clusterrole-controller.yaml @@ -114,6 +114,7 @@ rules: - watch - update - delete + - patch - apiGroups: - snapshot.storage.k8s.io resources: @@ -129,6 +130,7 @@ rules: - volumesnapshotcontents/status verbs: - update + - patch - apiGroups: - snapshot.storage.k8s.io resources: diff --git a/test/testdata/csipowermax/01-simple-deployment/out-csipowermax.yaml b/test/testdata/csipowermax/01-simple-deployment/out-csipowermax.yaml index eff30a8..af8efe1 100644 --- a/test/testdata/csipowermax/01-simple-deployment/out-csipowermax.yaml +++ b/test/testdata/csipowermax/01-simple-deployment/out-csipowermax.yaml @@ -4,7 +4,7 @@ metadata: name: test-powermax namespace: test-powermax annotations: - storage.dell.com/CSIDriverConfigVersion: v2.1.0 + storage.dell.com/CSIDriverConfigVersion: v2.2.0 storage.dell.com/attacher.Image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 storage.dell.com/attacher.Image.IsDefault: "true" storage.dell.com/provisioner.Image: k8s.gcr.io/sig-storage/csi-provisioner:v3.1.0 @@ -19,11 +19,11 @@ metadata: - "finalizer.dell.emc.com" spec: driver: - configVersion: v2.1.0 + configVersion: v2.2.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet common: - image: "dellemc/csi-powermax:v2.1.0.000R" + image: "dellemc/csi-powermax:v2.2.0.000R" imagePullPolicy: IfNotPresent envs: - name: X_CSI_MANAGED_ARRAYS diff --git a/test/testdata/csipowermax/01-simple-deployment/out-daemonset.yaml b/test/testdata/csipowermax/01-simple-deployment/out-daemonset.yaml index 59b2457..8b600da 100644 --- a/test/testdata/csipowermax/01-simple-deployment/out-daemonset.yaml +++ b/test/testdata/csipowermax/01-simple-deployment/out-daemonset.yaml @@ -78,9 +78,11 @@ spec: value: 5m - name: X_CSI_POWERMAX_CONFIG_PATH value: /powermax-config-params/driver-config-params.yaml + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" - name: X_CSI_POWERMAX_PORTGROUPS value: "" - image: dellemc/csi-powermax:v2.1.0.000R + image: dellemc/csi-powermax:v2.2.0.000R imagePullPolicy: IfNotPresent name: driver resources: {} diff --git a/test/testdata/csipowermax/01-simple-deployment/out-deployment.yaml b/test/testdata/csipowermax/01-simple-deployment/out-deployment.yaml index c127fa9..5f1458e 100644 --- a/test/testdata/csipowermax/01-simple-deployment/out-deployment.yaml +++ b/test/testdata/csipowermax/01-simple-deployment/out-deployment.yaml @@ -86,7 +86,9 @@ spec: value: 5m - name: X_CSI_POWERMAX_CONFIG_PATH value: /powermax-config-params/driver-config-params.yaml - image: dellemc/csi-powermax:v2.1.0.000R + - name: X_CSI_HEALTH_MONITOR_ENABLED + value: "false" + image: dellemc/csi-powermax:v2.2.0.000R imagePullPolicy: IfNotPresent name: driver resources: {} diff --git a/test/testdata/csipowerstore/01-simple-deployment/out-clusterrole-controller.yaml b/test/testdata/csipowerstore/01-simple-deployment/out-clusterrole-controller.yaml index 6da1bb8..4bb1371 100644 --- a/test/testdata/csipowerstore/01-simple-deployment/out-clusterrole-controller.yaml +++ b/test/testdata/csipowerstore/01-simple-deployment/out-clusterrole-controller.yaml @@ -114,6 +114,7 @@ rules: - watch - update - delete + - patch - apiGroups: - snapshot.storage.k8s.io resources: @@ -129,6 +130,7 @@ rules: - volumesnapshotcontents/status verbs: - update + - patch - apiGroups: - snapshot.storage.k8s.io resources: diff --git a/test/testdata/csiunity/01-simple-deployment/out-clusterrole-controller.yaml b/test/testdata/csiunity/01-simple-deployment/out-clusterrole-controller.yaml index a26281a..6d40462 100644 --- a/test/testdata/csiunity/01-simple-deployment/out-clusterrole-controller.yaml +++ b/test/testdata/csiunity/01-simple-deployment/out-clusterrole-controller.yaml @@ -101,6 +101,7 @@ rules: - watch - update - delete + - patch - apiGroups: - snapshot.storage.k8s.io resources: diff --git a/test/testdata/csivxflexos/01-simple-deployment/in-csidriverdeployment.yaml b/test/testdata/csivxflexos/01-simple-deployment/in-csidriverdeployment.yaml index 9a44e38..92843ae 100644 --- a/test/testdata/csivxflexos/01-simple-deployment/in-csidriverdeployment.yaml +++ b/test/testdata/csivxflexos/01-simple-deployment/in-csidriverdeployment.yaml @@ -5,12 +5,12 @@ metadata: namespace: test-vxflexos spec: driver: - configVersion: v2.1.0 + configVersion: v2.2.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - image: "dellemc/csi-vxflexos:v2.1.0" + image: "dellemc/csi-vxflexos:v2.2.0" imagePullPolicy: IfNotPresent envs: - name: X_CSI_VXFLEXOS_ENABLELISTVOLUMESNAPSHOT diff --git a/test/testdata/csivxflexos/01-simple-deployment/out-clusterrole-controller.yaml b/test/testdata/csivxflexos/01-simple-deployment/out-clusterrole-controller.yaml index 2417428..0ed7143 100644 --- a/test/testdata/csivxflexos/01-simple-deployment/out-clusterrole-controller.yaml +++ b/test/testdata/csivxflexos/01-simple-deployment/out-clusterrole-controller.yaml @@ -117,6 +117,7 @@ rules: - watch - update - delete + - patch - apiGroups: - snapshot.storage.k8s.io resources: @@ -132,6 +133,7 @@ rules: - volumesnapshotcontents/status verbs: - update + - patch - apiGroups: - snapshot.storage.k8s.io resources: diff --git a/test/testdata/csivxflexos/01-simple-deployment/out-csivxflexos.yaml b/test/testdata/csivxflexos/01-simple-deployment/out-csivxflexos.yaml index 943e14a..4f66742 100644 --- a/test/testdata/csivxflexos/01-simple-deployment/out-csivxflexos.yaml +++ b/test/testdata/csivxflexos/01-simple-deployment/out-csivxflexos.yaml @@ -2,7 +2,7 @@ apiVersion: storage.dell.com/v1 kind: CSIVXFlexOS metadata: annotations: - storage.dell.com/CSIDriverConfigVersion: v2.1.0 + storage.dell.com/CSIDriverConfigVersion: v2.2.0 storage.dell.com/attacher.Image: k8s.gcr.io/sig-storage/csi-attacher:v3.4.0 storage.dell.com/attacher.Image.IsDefault: "true" storage.dell.com/external-health-monitor.Image: gcr.io/k8s-staging-sig-storage/csi-external-health-monitor-controller:v0.4.0 @@ -31,9 +31,9 @@ spec: value: "true" - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS value: "false" - image: dellemc/csi-vxflexos:v2.1.0 + image: dellemc/csi-vxflexos:v2.2.0 imagePullPolicy: IfNotPresent - configVersion: v2.1.0 + configVersion: v2.2.0 controller: {} initContainers: - envs: diff --git a/test/testdata/csivxflexos/01-simple-deployment/out-daemonset.yaml b/test/testdata/csivxflexos/01-simple-deployment/out-daemonset.yaml index 75b9c59..461b010 100644 --- a/test/testdata/csivxflexos/01-simple-deployment/out-daemonset.yaml +++ b/test/testdata/csivxflexos/01-simple-deployment/out-daemonset.yaml @@ -40,7 +40,7 @@ spec: value: "false" - name: X_CSI_VXFLEXOS_ENABLESNAPSHOTCGDELETE value: "false" - image: dellemc/csi-vxflexos:v2.1.0 + image: dellemc/csi-vxflexos:v2.2.0 imagePullPolicy: IfNotPresent name: driver args: diff --git a/test/testdata/csivxflexos/01-simple-deployment/out-deployment.yaml b/test/testdata/csivxflexos/01-simple-deployment/out-deployment.yaml index 23a7cf5..e1cb704 100644 --- a/test/testdata/csivxflexos/01-simple-deployment/out-deployment.yaml +++ b/test/testdata/csivxflexos/01-simple-deployment/out-deployment.yaml @@ -53,7 +53,7 @@ spec: value: "false" - name: X_CSI_ALLOW_RWO_MULTI_POD_ACCESS value: "false" - image: dellemc/csi-vxflexos:v2.1.0 + image: dellemc/csi-vxflexos:v2.2.0 imagePullPolicy: IfNotPresent name: driver resources: {}