From 0bb2f63b122fd765a20b46d4919293bf3349aa22 Mon Sep 17 00:00:00 2001 From: nb950 Date: Wed, 23 Feb 2022 15:09:36 -0500 Subject: [PATCH 1/5] add support for powerscale 2.2.0 --- api/v1alpha1/types.go | 9 +++++++++ api/v1alpha1/zz_generated.deepcopy.go | 16 ++++++++++++++++ ...storage.dell.com_containerstoragemodules.yaml | 6 ++++++ config/manager/kustomization.yaml | 4 ++++ controllers/csm_controller.go | 4 +--- deploy/operator.yaml | 7 +++++++ .../{v2.1.0 => v2.2.0}/controller.yaml | 0 .../powerscale/{v2.1.0 => v2.2.0}/csidriver.yaml | 3 ++- .../{v2.1.0 => v2.2.0}/driver-config-params.yaml | 0 .../powerscale/{v2.1.0 => v2.2.0}/node.yaml | 0 pkg/drivers/commonconfig.go | 11 +++++++++++ samples/storage_csm_powerscale.yaml | 11 ++++++++--- 12 files changed, 64 insertions(+), 7 deletions(-) rename operatorconfig/driverconfig/powerscale/{v2.1.0 => v2.2.0}/controller.yaml (100%) rename operatorconfig/driverconfig/powerscale/{v2.1.0 => v2.2.0}/csidriver.yaml (76%) rename operatorconfig/driverconfig/powerscale/{v2.1.0 => v2.2.0}/driver-config-params.yaml (100%) rename operatorconfig/driverconfig/powerscale/{v2.1.0 => v2.2.0}/node.yaml (100%) diff --git a/api/v1alpha1/types.go b/api/v1alpha1/types.go index 4eb3672df..4b79f31f5 100644 --- a/api/v1alpha1/types.go +++ b/api/v1alpha1/types.go @@ -129,6 +129,10 @@ type Driver struct { // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI Driver Type" CSIDriverType DriverType `json:"csiDriverType" yaml:"csiDriverType"` + // CSIDriverSpec is the specification for CSIDriver + // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="CSI Driver Spec" + CSIDriverSpec CSIDriverSpec `json:"csiDriverSpec" yaml:"csiDriverSpec"` + // ConfigVersion is the configuration version of the driver // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Config Version" ConfigVersion string `json:"configVersion" yaml:"configVersion"` @@ -230,3 +234,8 @@ type SnapshotClass struct { // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Snapshot Class Parameters" Parameters map[string]string `json:"parameters,omitempty" yaml:"parameters"` } + +//CSIDriverSpec struct +type CSIDriverSpec struct { + FSGroupPolicy string `json:"fSGroupPolicy,omitempty" yaml:"fSGroupPolicy,omitempty"` +} diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index d27896732..4001600d1 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -26,6 +26,21 @@ import ( runtime "k8s.io/apimachinery/pkg/runtime" ) +// DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. +func (in *CSIDriverSpec) DeepCopyInto(out *CSIDriverSpec) { + *out = *in +} + +// DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new CSIDriverSpec. +func (in *CSIDriverSpec) DeepCopy() *CSIDriverSpec { + if in == nil { + return nil + } + out := new(CSIDriverSpec) + in.DeepCopyInto(out) + return out +} + // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *ContainerStorageModule) DeepCopyInto(out *ContainerStorageModule) { *out = *in @@ -174,6 +189,7 @@ func (in *ContainerTemplate) DeepCopy() *ContainerTemplate { // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *Driver) DeepCopyInto(out *Driver) { *out = *in + out.CSIDriverSpec = in.CSIDriverSpec in.Common.DeepCopyInto(&out.Common) in.Controller.DeepCopyInto(&out.Controller) in.Node.DeepCopyInto(&out.Node) diff --git a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml index e131fd376..655be4347 100644 --- a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml +++ b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml @@ -438,6 +438,12 @@ spec: type: object type: array type: object + csiDriverSpec: + description: CSIDriverSpec is the specification for CSIDriver + properties: + fSGroupPolicy: + type: string + type: object csiDriverType: description: CSIDriverType is the CSI Driver type for Dell EMC - e.g, powermax, powerflex,... diff --git a/config/manager/kustomization.yaml b/config/manager/kustomization.yaml index 538c69f29..e204f382e 100644 --- a/config/manager/kustomization.yaml +++ b/config/manager/kustomization.yaml @@ -10,3 +10,7 @@ configMapGenerator: name: manager-config apiVersion: kustomize.config.k8s.io/v1beta1 kind: Kustomization +images: +- name: controller + newName: dellemc/dell-csm-operator + newTag: 0.1.0 diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go index 753f26237..583efc8ed 100644 --- a/controllers/csm_controller.go +++ b/controllers/csm_controller.go @@ -680,12 +680,10 @@ func (r *ContainerStorageModuleReconciler) PreChecks(ctx context.Context, cr *cs if cr.Spec.Driver.Common.Image == "" { return fmt.Errorf("driver image not specified in spec") } - if cr.Spec.Driver.ConfigVersion == "" || cr.Spec.Driver.ConfigVersion != "v2.1.0" { + if cr.Spec.Driver.ConfigVersion == "" || cr.Spec.Driver.ConfigVersion != "v2.2.0" { return fmt.Errorf("driver version not specified in spec or driver version is not valid") } - // add check for version - // Check drivers switch cr.Spec.Driver.CSIDriverType { case csmv1.PowerScale: diff --git a/deploy/operator.yaml b/deploy/operator.yaml index 90b9716cb..5846be5db 100644 --- a/deploy/operator.yaml +++ b/deploy/operator.yaml @@ -1,4 +1,11 @@ apiVersion: v1 +kind: Namespace +metadata: + labels: + control-plane: controller-manager + name: dell-csm-operator +--- +apiVersion: v1 kind: ServiceAccount metadata: labels: diff --git a/operatorconfig/driverconfig/powerscale/v2.1.0/controller.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml similarity index 100% rename from operatorconfig/driverconfig/powerscale/v2.1.0/controller.yaml rename to operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml diff --git a/operatorconfig/driverconfig/powerscale/v2.1.0/csidriver.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/csidriver.yaml similarity index 76% rename from operatorconfig/driverconfig/powerscale/v2.1.0/csidriver.yaml rename to operatorconfig/driverconfig/powerscale/v2.2.0/csidriver.yaml index fec9264ff..a47128ce8 100644 --- a/operatorconfig/driverconfig/powerscale/v2.1.0/csidriver.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.2.0/csidriver.yaml @@ -5,6 +5,7 @@ metadata: spec: attachRequired: true podInfoOnMount: true + fsGroupPolicy: ReadWriteOnceWithFSType volumeLifecycleModes: - Persistent - - Ephemeral \ No newline at end of file + - Ephemeral diff --git a/operatorconfig/driverconfig/powerscale/v2.1.0/driver-config-params.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/driver-config-params.yaml similarity index 100% rename from operatorconfig/driverconfig/powerscale/v2.1.0/driver-config-params.yaml rename to operatorconfig/driverconfig/powerscale/v2.2.0/driver-config-params.yaml diff --git a/operatorconfig/driverconfig/powerscale/v2.1.0/node.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml similarity index 100% rename from operatorconfig/driverconfig/powerscale/v2.1.0/node.yaml rename to operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml diff --git a/pkg/drivers/commonconfig.go b/pkg/drivers/commonconfig.go index f4b4736f2..da27d5811 100644 --- a/pkg/drivers/commonconfig.go +++ b/pkg/drivers/commonconfig.go @@ -254,5 +254,16 @@ func GetCSIDriver(ctx context.Context, cr csmv1.ContainerStorageModule, operator return nil, err } + if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy != "" { + fsGroupPolicy := storagev1.NoneFSGroupPolicy + if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy == "ReadWriteOnceWithFSType" { + fsGroupPolicy = storagev1.ReadWriteOnceWithFSTypeFSGroupPolicy + } else if cr.Spec.Driver.CSIDriverSpec.FSGroupPolicy == "File" { + fsGroupPolicy = storagev1.FileFSGroupPolicy + } + csidriver.Spec.FSGroupPolicy = &fsGroupPolicy + log.Debugw("GetCSIDriver", "fsGroupPolicy", fsGroupPolicy) + } + return &csidriver, nil } diff --git a/samples/storage_csm_powerscale.yaml b/samples/storage_csm_powerscale.yaml index a9086a9ef..d25adb0a4 100644 --- a/samples/storage_csm_powerscale.yaml +++ b/samples/storage_csm_powerscale.yaml @@ -6,8 +6,13 @@ metadata: spec: driver: csiDriverType: "isilon" + csiDriverSpec: + # fsGroupPolicy: Defines if the underlying volume supports changing ownership and permission of the volume before being mounted. + # Allowed values: ReadWriteOnceWithFSType, File , None + # Default value: ReadWriteOnceWithFSType + fSGroupPolicy: "ReadWriteOnceWithFSType" # Config version for CSI PowerScale v2.1.0 driver - configVersion: v2.1.0 + configVersion: v2.2.0 authSecret: test-isilon-creds replicas: 1 dnsPolicy: ClusterFirstWithHostNet @@ -15,8 +20,8 @@ spec: # Uninstall CSI Driver and/or modules when CR is deleted forceRemoveDriver: false common: - # Image for CSI PowerScale driver v2.1.0 - image: "dellemc/csi-isilon:v2.1.0" + # Image for CSI PowerScale driver v2.2.0 + image: "dellemc/csi-isilon:nightly" imagePullPolicy: IfNotPresent envs: # X_CSI_VERBOSE: Indicates what content of the OneFS REST API message should be logged in debug level logs From 2adeafb682a3a4fa36b4a4d057bfa80d9a05a735 Mon Sep 17 00:00:00 2001 From: nb950 Date: Wed, 23 Feb 2022 15:20:47 -0500 Subject: [PATCH 2/5] update test to v2.2.0 --- .../config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/bad.yaml | 0 .../driverconfig/powerscale/{v2.1.0 => v2.2.0}/controller.yaml | 0 .../driverconfig/powerscale/{v2.1.0 => v2.2.0}/csidriver.yaml | 0 .../powerscale/{v2.1.0 => v2.2.0}/driver-config-params.yaml | 0 .../config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/node.yaml | 0 tests/shared/common.go | 2 +- 6 files changed, 1 insertion(+), 1 deletion(-) rename tests/config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/bad.yaml (100%) rename tests/config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/controller.yaml (100%) rename tests/config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/csidriver.yaml (100%) rename tests/config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/driver-config-params.yaml (100%) rename tests/config/driverconfig/powerscale/{v2.1.0 => v2.2.0}/node.yaml (100%) diff --git a/tests/config/driverconfig/powerscale/v2.1.0/bad.yaml b/tests/config/driverconfig/powerscale/v2.2.0/bad.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.1.0/bad.yaml rename to tests/config/driverconfig/powerscale/v2.2.0/bad.yaml diff --git a/tests/config/driverconfig/powerscale/v2.1.0/controller.yaml b/tests/config/driverconfig/powerscale/v2.2.0/controller.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.1.0/controller.yaml rename to tests/config/driverconfig/powerscale/v2.2.0/controller.yaml diff --git a/tests/config/driverconfig/powerscale/v2.1.0/csidriver.yaml b/tests/config/driverconfig/powerscale/v2.2.0/csidriver.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.1.0/csidriver.yaml rename to tests/config/driverconfig/powerscale/v2.2.0/csidriver.yaml diff --git a/tests/config/driverconfig/powerscale/v2.1.0/driver-config-params.yaml b/tests/config/driverconfig/powerscale/v2.2.0/driver-config-params.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.1.0/driver-config-params.yaml rename to tests/config/driverconfig/powerscale/v2.2.0/driver-config-params.yaml diff --git a/tests/config/driverconfig/powerscale/v2.1.0/node.yaml b/tests/config/driverconfig/powerscale/v2.2.0/node.yaml similarity index 100% rename from tests/config/driverconfig/powerscale/v2.1.0/node.yaml rename to tests/config/driverconfig/powerscale/v2.2.0/node.yaml diff --git a/tests/shared/common.go b/tests/shared/common.go index 45359a943..48da6edeb 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -13,7 +13,7 @@ import ( const ( // ConfigVersion - used in all unit test - ConfigVersion string = "v2.1.0" + ConfigVersion string = "v2.2.0" ) // StorageKey is used to store a runtime object. It's used for both clientgo client and controller runtime client From a7a8ba0c6c95ea65a6d7f4b059eabac42f1ca567 Mon Sep 17 00:00:00 2001 From: nb950 Date: Wed, 23 Feb 2022 15:25:00 -0500 Subject: [PATCH 3/5] update badtests folder to v2.2.0 --- tests/config/driverconfig/badDriver/{v2.1.0 => v2.2.0}/bad.yaml | 0 .../driverconfig/badDriver/{v2.1.0 => v2.2.0}/controller.yaml | 0 .../driverconfig/badDriver/{v2.1.0 => v2.2.0}/csidriver.yaml | 0 .../badDriver/{v2.1.0 => v2.2.0}/driver-config-params.yaml | 0 4 files changed, 0 insertions(+), 0 deletions(-) rename tests/config/driverconfig/badDriver/{v2.1.0 => v2.2.0}/bad.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.1.0 => v2.2.0}/controller.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.1.0 => v2.2.0}/csidriver.yaml (100%) rename tests/config/driverconfig/badDriver/{v2.1.0 => v2.2.0}/driver-config-params.yaml (100%) diff --git a/tests/config/driverconfig/badDriver/v2.1.0/bad.yaml b/tests/config/driverconfig/badDriver/v2.2.0/bad.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.1.0/bad.yaml rename to tests/config/driverconfig/badDriver/v2.2.0/bad.yaml diff --git a/tests/config/driverconfig/badDriver/v2.1.0/controller.yaml b/tests/config/driverconfig/badDriver/v2.2.0/controller.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.1.0/controller.yaml rename to tests/config/driverconfig/badDriver/v2.2.0/controller.yaml diff --git a/tests/config/driverconfig/badDriver/v2.1.0/csidriver.yaml b/tests/config/driverconfig/badDriver/v2.2.0/csidriver.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.1.0/csidriver.yaml rename to tests/config/driverconfig/badDriver/v2.2.0/csidriver.yaml diff --git a/tests/config/driverconfig/badDriver/v2.1.0/driver-config-params.yaml b/tests/config/driverconfig/badDriver/v2.2.0/driver-config-params.yaml similarity index 100% rename from tests/config/driverconfig/badDriver/v2.1.0/driver-config-params.yaml rename to tests/config/driverconfig/badDriver/v2.2.0/driver-config-params.yaml From bba57f81f07421afdd43cf4673b1590dbf92df0e Mon Sep 17 00:00:00 2001 From: nb950 Date: Wed, 23 Feb 2022 15:29:58 -0500 Subject: [PATCH 4/5] change to v2.2.0 --- .../manifests/dell-csm-operator.clusterserviceversion.yaml | 6 +++--- .../driverconfig/powerscale/v2.2.0/controller.yaml | 4 ++-- operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml | 2 +- operatorconfig/moduleconfig/common/version-values.yaml | 2 +- pkg/modules/testdata/cr_powerscale_auth.yaml | 4 ++-- pkg/utils/status.go | 2 +- samples/storage_csm_powerscale.yaml | 2 +- tests/README.md | 2 +- tests/config/driverconfig/powerscale/v2.2.0/node.yaml | 2 +- tests/e2e/testfiles/storage_csm_powerscale.yaml | 6 +++--- tests/e2e/testfiles/storage_csm_powerscale_auth.yaml | 6 +++--- 11 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 893a14d18..448c6ef6b 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -48,10 +48,10 @@ metadata: "value": "debug" } ], - "image": "dellemc/csi-isilon:v2.0.0", + "image": "dellemc/csi-isilon:v2.x.y", "imagePullPolicy": "IfNotPresent" }, - "configVersion": "v2.0.0", + "configVersion": "v2.x.y", "controller": { "envs": [ { @@ -112,7 +112,7 @@ metadata: "image": "dellemc/csm-authorization-sidecar:v1.0.0" } ], - "configVersion": "v2.0.0", + "configVersion": "v2.x.y", "enabled": false, "name": "authorization" } diff --git a/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml index 63c2d27f6..a06c17464 100644 --- a/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.2.0/controller.yaml @@ -213,7 +213,7 @@ spec: - name: socket-dir mountPath: /var/run/csi - name: driver - image: dellemc/csi-isilon:v2.1.0 + image: dellemc/csi-isilon:v2.2.0 imagePullPolicy: IfNotPresent command: [ "/csi-isilon" ] args: @@ -285,4 +285,4 @@ spec: secretName: -creds - name: csi-isilon-config-params configMap: - name: -config-params \ No newline at end of file + name: -config-params diff --git a/operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml b/operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml index f677975c9..5e4f71ad8 100644 --- a/operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml +++ b/operatorconfig/driverconfig/powerscale/v2.2.0/node.yaml @@ -77,7 +77,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-isilon:v2.1.0 + image: dellemc/csi-isilon:v2.2.0 imagePullPolicy: IfNotPresent env: - name: CSI_ENDPOINT diff --git a/operatorconfig/moduleconfig/common/version-values.yaml b/operatorconfig/moduleconfig/common/version-values.yaml index 8aa53910f..8bc563a48 100644 --- a/operatorconfig/moduleconfig/common/version-values.yaml +++ b/operatorconfig/moduleconfig/common/version-values.yaml @@ -3,5 +3,5 @@ powerscale: # List of Driver versions and modules that supports the version v2.0.0: authorization: "v1.0.0" - v2.1.0: + v2.2.0: authorization: "v1.0.0" diff --git a/pkg/modules/testdata/cr_powerscale_auth.yaml b/pkg/modules/testdata/cr_powerscale_auth.yaml index 8f36e1544..7d320df67 100644 --- a/pkg/modules/testdata/cr_powerscale_auth.yaml +++ b/pkg/modules/testdata/cr_powerscale_auth.yaml @@ -6,11 +6,11 @@ metadata: spec: driver: csiDriverType: "isilon" - configVersion: v2.1.0 + configVersion: v2.2.0 authSecret: test-isilon-creds-custom replicas: 1 common: - image: "dellemc/csi-isilon:v2.1.0" + image: "dellemc/csi-isilon:v2.2.0" imagePullPolicy: IfNotPresent modules: diff --git a/pkg/utils/status.go b/pkg/utils/status.go index a5cca76c9..8b4988d0a 100644 --- a/pkg/utils/status.go +++ b/pkg/utils/status.go @@ -121,7 +121,7 @@ func getDaemonSetStatus(ctx context.Context, instance *csmv1.ContainerStorageMod failedCount++ for _, cs := range pod.Status.ContainerStatuses { if cs.State.Waiting != nil && cs.State.Waiting.Reason != constants.ContainerCreating { - //message: Back-off pulling image "dellec/csi-isilon:v2.1.0" + //message: Back-off pulling image "dellec/csi-isilon:xxxx" //reason: ImagePullBackOff log.Infow("daemonset pod container", "message", cs.State.Waiting.Message, constants.Reason, cs.State.Waiting.Reason) shortMsg := strings.Replace(cs.State.Waiting.Message, diff --git a/samples/storage_csm_powerscale.yaml b/samples/storage_csm_powerscale.yaml index d25adb0a4..171731ae0 100644 --- a/samples/storage_csm_powerscale.yaml +++ b/samples/storage_csm_powerscale.yaml @@ -11,7 +11,7 @@ spec: # Allowed values: ReadWriteOnceWithFSType, File , None # Default value: ReadWriteOnceWithFSType fSGroupPolicy: "ReadWriteOnceWithFSType" - # Config version for CSI PowerScale v2.1.0 driver + # Config version for CSI PowerScale v2.2.0 driver configVersion: v2.2.0 authSecret: test-isilon-creds replicas: 1 diff --git a/tests/README.md b/tests/README.md index 90bdb6512..2acab5d42 100644 --- a/tests/README.md +++ b/tests/README.md @@ -1,7 +1,7 @@ # Test for CSM Operator This is the test directory for CSM operator. -`config` directory includes yaml files consumed by test cases. For example `driverconfig/powerscale/v2.1.0/node.yaml` is consumed by `pkg/drivers/commonconfig_test.go`. +`config` directory includes yaml files consumed by test cases. For example `driverconfig/powerscale/v2.x.y/node.yaml` is consumed by `pkg/drivers/commonconfig_test.go`. `shared/clientgoclient` implements kubernetes client from client-go package. It has a getter function for each API version like `AppsV1Interface` or `CoreV1Interface`. `AppsV1Interface` is the one that we need as it has getter function for `daemonsetInterface`. The `daemonsetInterface` has all `Create`, `Apply`, `Delete` etc. methods that we will be using to manipulate Kubernetes runtime objects. diff --git a/tests/config/driverconfig/powerscale/v2.2.0/node.yaml b/tests/config/driverconfig/powerscale/v2.2.0/node.yaml index 4183edcb1..16a90eb54 100644 --- a/tests/config/driverconfig/powerscale/v2.2.0/node.yaml +++ b/tests/config/driverconfig/powerscale/v2.2.0/node.yaml @@ -77,7 +77,7 @@ spec: capabilities: add: ["SYS_ADMIN"] allowPrivilegeEscalation: true - image: dellemc/csi-isilon:v2.1.0 + image: dellemc/csi-isilon:v2.2.0 imagePullPolicy: IfNotPresent env: - name: CSI_ENDPOINT diff --git a/tests/e2e/testfiles/storage_csm_powerscale.yaml b/tests/e2e/testfiles/storage_csm_powerscale.yaml index 866dace6d..b6ea51e38 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale.yaml @@ -7,8 +7,8 @@ spec: driver: csiDriverType: "isilon" - # Config version for CSI PowerScale v2.1.0 driver - configVersion: v2.1.0 + # Config version for CSI PowerScale v2.2.0 driver + configVersion: v2.2.0 authSecret: test-isilon-creds @@ -16,7 +16,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerScale driver v2.1.0 + # Image for CSI PowerScale driver v2.2.0 image: "dellemc/csi-isilon:nightly" imagePullPolicy: IfNotPresent envs: diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml index 1125ff0d0..d06804726 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml @@ -7,8 +7,8 @@ spec: driver: csiDriverType: "isilon" - # Config version for CSI PowerScale v2.1.0 driver - configVersion: v2.1.0 + # Config version for CSI PowerScale v2.2.0 driver + configVersion: v2.2.0 authSecret: test-isilon-creds-auth @@ -16,7 +16,7 @@ spec: dnsPolicy: ClusterFirstWithHostNet forceUpdate: false common: - # Image for CSI PowerScale driver v2.1.0 + # Image for CSI PowerScale driver v2.2.0 image: "dellemc/csi-isilon:nightly" imagePullPolicy: IfNotPresent envs: From ed2d6d265789a72801941dd6902db55bd98cf135 Mon Sep 17 00:00:00 2001 From: nb950 Date: Wed, 23 Feb 2022 15:33:35 -0500 Subject: [PATCH 5/5] update coverage min --- .github/workflows/actions.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/actions.yml b/.github/workflows/actions.yml index dff00a316..fd1bd115c 100644 --- a/.github/workflows/actions.yml +++ b/.github/workflows/actions.yml @@ -39,7 +39,7 @@ jobs: - name: Run unit tests and check package coverage uses: dell/common-github-actions/go-code-tester@csm-operator-controllers with: - threshold: 50 + threshold: 64 test_driver: name: Run Go unit tests on driver and check package coverage runs-on: ubuntu-latest @@ -54,7 +54,7 @@ jobs: - name: Run unit tests and check package coverage uses: dell/common-github-actions/go-code-tester@csm-operator-drivers with: - threshold: 80 + threshold: 77 go_security_scan: name: Go security runs-on: ubuntu-latest