From e87631bd057fbd55a7b887d3548caed4f8bd2ee5 Mon Sep 17 00:00:00 2001 From: EvgenyUglov <63835199+EvgenyUglov@users.noreply.github.com> Date: Thu, 5 Dec 2024 16:21:47 -0500 Subject: [PATCH 1/8] Read zone information from PowerFlex secret (#810) * start tests * Implement zone info extraction * Add new err checks and tests * Fix lint errors * Add method description * Address comments --------- Co-authored-by: Aaron Tye --- pkg/drivers/powerflex.go | 53 ++++++++++++++ pkg/drivers/powerflex_test.go | 126 ++++++++++++++++++++++++++++++++++ 2 files changed, 179 insertions(+) diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go index 84d6c7b10..56d88e4ba 100644 --- a/pkg/drivers/powerflex.go +++ b/pkg/drivers/powerflex.go @@ -346,3 +346,56 @@ func ModifyPowerflexCR(yamlString string, cr csmv1.ContainerStorageModule, fileT } return yamlString } + +// ExtractZonesFromSecret - Reads the array config secret and returns the zone label information +func ExtractZonesFromSecret(ctx context.Context, kube client.Client, namespace string, secret string) (map[string]string, error) { + log := logger.GetLogger(ctx) + + arraySecret, err := utils.GetSecret(ctx, secret, namespace, kube) + if err != nil { + return nil, fmt.Errorf("reading secret [%s] error [%s]", secret, err) + } + + type StorageArrayConfig struct { + SystemID string `json:"systemId"` + Zone struct { + Name string `json:"name"` + LabelKey string `json:"labelKey"` + } `json:"zone"` + } + + data := arraySecret.Data + configBytes := data["config"] + zonesMapData := make(map[string]string) + + if string(configBytes) != "" { + yamlConfig := make([]StorageArrayConfig, 0) + configs, err := yaml.JSONToYAML(configBytes) + if err != nil { + return nil, fmt.Errorf("unable to parse multi-array configuration[%v]", err) + } + err = yaml.Unmarshal(configs, &yamlConfig) + if err != nil { + return nil, fmt.Errorf("unable to unmarshal multi-array configuration[%v]", err) + } + + for _, configParam := range yamlConfig { + if configParam.SystemID == "" { + return nil, fmt.Errorf("invalid value for SystemID") + } + if configParam.Zone.LabelKey != "" { + if configParam.Zone.Name != "" { + zonesMapData[configParam.Zone.LabelKey] = configParam.Zone.Name + log.Infof("Zoning information configured for systemID %s: %v ", configParam.SystemID, zonesMapData) + } + } else { + log.Info("Zoning information not found in the array config. Continue with topology-unaware driver installation mode") + return zonesMapData, nil + } + } + } else { + return nil, fmt.Errorf("Array details are not provided in vxflexos-config secret") + } + + return zonesMapData, nil +} diff --git a/pkg/drivers/powerflex_test.go b/pkg/drivers/powerflex_test.go index 19fbb2eec..79b14ecab 100644 --- a/pkg/drivers/powerflex_test.go +++ b/pkg/drivers/powerflex_test.go @@ -22,7 +22,9 @@ import ( "github.com/dell/csm-operator/tests/shared/crclient" "github.com/stretchr/testify/assert" corev1 "k8s.io/api/core/v1" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/client" + "sigs.k8s.io/controller-runtime/pkg/client/fake" ) var ( @@ -194,3 +196,127 @@ func TestModifyPowerflexCR(t *testing.T) { }) } } + +func TestExtractZonesFromSecret(t *testing.T) { + emptyConfigData := `` + invalidConfigData := ` +- username: "admin" + - +` + dataWithNoSystemID := ` +- username: "admin" + password: "password" + endpoint: "https://127.0.0.2" + skipCertificateValidation: true + mdm: "10.0.0.3,10.0.0.4" +` + dataWithZone := ` +- username: "admin" + password: "password" + systemID: "2b11bb111111bb1b" + endpoint: "https://127.0.0.2" + skipCertificateValidation: true + mdm: "10.0.0.3,10.0.0.4" + zone: + name: "US-EAST" + labelKey: "zone.csi-vxflexos.dellemc.com" +` + dataWithoutZone := ` +- username: "admin" + password: "password" + systemID: "2b11bb111111bb1b" + endpoint: "https://127.0.0.2" + skipCertificateValidation: true + mdm: "10.0.0.3,10.0.0.4" +` + ctx := context.Background() + tests := map[string]func() (client.WithWatch, map[string]string, string, bool){ + "success with zone": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(dataWithZone), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, map[string]string{"zone.csi-vxflexos.dellemc.com": "US-EAST"}, "vxflexos-config", false + }, + "success no zone": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(dataWithoutZone), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, map[string]string{}, "vxflexos-config", false + }, + "error getting secret": func() (client.WithWatch, map[string]string, string, bool) { + client := fake.NewClientBuilder().Build() + return client, nil, "vxflexos-not-found", true + }, + "error parsing empty secret": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(emptyConfigData), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, nil, "vxflexos-config", true + }, + "error with no system id": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(dataWithNoSystemID), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, nil, "vxflexos-config", true + }, + "error unmarshaling config": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(invalidConfigData), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, nil, "vxflexos-config", true + }, + } + + for name, tc := range tests { + t.Run(name, func(t *testing.T) { + client, wantZones, secret, wantErr := tc() + zones, err := ExtractZonesFromSecret(ctx, client, "vxflexos", secret) + if wantErr { + assert.NotNil(t, err) + } else { + assert.Nil(t, err) + assert.Equal(t, wantZones, zones) + } + }) + } +} From 0e44430f4af432f6e14591ad2840450aa6f388ad Mon Sep 17 00:00:00 2001 From: KshitijaKakde <111420075+KshitijaKakde@users.noreply.github.com> Date: Fri, 6 Dec 2024 10:09:15 +0530 Subject: [PATCH 2/8] pmax mode changes (#813) --- samples/csireverseproxy/config.yaml | 3 +-- .../powermax-templates/powermax_reverse_proxy_config.yaml | 3 +-- .../powermax-templates/powermax_reverse_proxy_config_auth.yaml | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/samples/csireverseproxy/config.yaml b/samples/csireverseproxy/config.yaml index a1a0a7066..fa12fd889 100644 --- a/samples/csireverseproxy/config.yaml +++ b/samples/csireverseproxy/config.yaml @@ -15,11 +15,10 @@ # Fill in the appropriate values, refer to docs if required # Create the configmap using following cmd # kubectl/oc create configmap powermax-reverseproxy-config --from-file config.yaml -n -mode: StandAlone # Mode for the reverseproxy, should not be changed port: 2222 logLevel: debug logFormat: text -standAloneConfig: +config: storageArrays: - storageArrayId: "000000000001" # arrayID primaryURL: https://primary-1.unisphe.re:8443 # primary unisphere for arrayID diff --git a/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config.yaml b/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config.yaml index a25ba6917..fda6fbd47 100644 --- a/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config.yaml +++ b/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config.yaml @@ -15,11 +15,10 @@ # Fill in the appropriate values, refer to docs if required # Create the configmap using following cmd # kubectl/oc create configmap powermax-reverseproxy-config --from-file config.yaml -n -mode: StandAlone # Mode for the reverseproxy, should not be changed port: 2222 logLevel: debug logFormat: text -standAloneConfig: +config: storageArrays: - storageArrayId: "REPLACE_SYSTEMID" primaryURL: "https://REPLACE_ENDPOINT" diff --git a/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml b/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml index fad40dc33..8e673356e 100644 --- a/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml +++ b/tests/e2e/testfiles/powermax-templates/powermax_reverse_proxy_config_auth.yaml @@ -15,11 +15,10 @@ # Fill in the appropriate values, refer to docs if required # Create the configmap using following cmd # kubectl/oc create configmap powermax-reverseproxy-config --from-file config.yaml -n -mode: StandAlone # Mode for the reverseproxy, should not be changed port: 2222 logLevel: debug logFormat: text -standAloneConfig: +config: storageArrays: - storageArrayId: "REPLACE_SYSTEMID" primaryURL: "https://REPLACE_AUTH_ENDPOINT" From 0ac24197fe63d48be29a62c6b0cc8e2f129a4dd2 Mon Sep 17 00:00:00 2001 From: Aly Nathoo <98403872+anathoodell@users.noreply.github.com> Date: Fri, 6 Dec 2024 09:18:43 -0500 Subject: [PATCH 3/8] Detect Zone info in node labels (#811) * Adding GetMatchingNodes as a function to find Nodes that have labels that match label and label value. Signed-off-by: Aly Nathoo --------- Signed-off-by: Aly Nathoo --- controllers/csm_controller.go | 10 ++++++ controllers/csm_controller_test.go | 54 ++++++++++++++++++++++++++++++ tests/shared/common.go | 13 +++++++ tests/shared/crclient/client.go | 14 ++++++++ 4 files changed, 91 insertions(+) diff --git a/controllers/csm_controller.go b/controllers/csm_controller.go index 997a516c0..05a1054da 100644 --- a/controllers/csm_controller.go +++ b/controllers/csm_controller.go @@ -1517,3 +1517,13 @@ func (r *ContainerStorageModuleReconciler) GetUpdateCount() int32 { func (r *ContainerStorageModuleReconciler) GetK8sClient() kubernetes.Interface { return r.K8sClient } + +func (r *ContainerStorageModuleReconciler) GetMatchingNodes(ctx context.Context, labelKey string, labelValue string) (*corev1.NodeList, error) { + nodeList := &corev1.NodeList{} + opts := []client.ListOption{ + client.MatchingLabels{labelKey: labelValue}, + } + err := r.List(ctx, nodeList, opts...) + + return nodeList, err +} diff --git a/controllers/csm_controller_test.go b/controllers/csm_controller_test.go index 91e111651..3b80ecbe0 100644 --- a/controllers/csm_controller_test.go +++ b/controllers/csm_controller_test.go @@ -2382,3 +2382,57 @@ func (suite *CSMControllerTestSuite) makeFakeRevProxyCSM(name string, ns string, err = suite.fakeClient.Create(ctx, &csm) assert.Nil(suite.T(), err) } + +func (suite *CSMControllerTestSuite) TestGetNodeLabels() { + // TBD: crclient/client.go needs to be augmented to filter on labels during + // the List return for a viable thorough test. Since this functionality is + // missing, this test is quite elementary as a result. + + csm := shared.MakeCSM(csmName, suite.namespace, configVersion) + csm.Spec.Driver.CSIDriverType = csmv1.PowerScale + csm.Spec.Driver.Common.Image = "image" + csm.Annotations[configVersionKey] = configVersion + + sec := shared.MakeSecret(csmName+"-creds", suite.namespace, configVersion) + err := suite.fakeClient.Create(ctx, sec) + if err != nil { + panic(err) + } + + csm.ObjectMeta.Finalizers = []string{CSMFinalizerName} + err = suite.fakeClient.Create(ctx, &csm) + if err != nil { + panic(err) + } + + reconciler := suite.createReconciler() + + // create node object, add to fakeclient, reconcile.GetMatchingNodes + node := shared.MakeNode("node1", suite.namespace) + node.Labels["topology.kubernetes.io/zone"] = "US-EAST" + + err = suite.fakeClient.Create(ctx, &node) + assert.Nil(suite.T(), err) + + nodeList := &corev1.NodeList{} + err = suite.fakeClient.List(ctx, nodeList, nil) + assert.Nil(suite.T(), err) + + nodeListMatching, err := reconciler.GetMatchingNodes(ctx, "topology.kubernetes.io/zone", "US-EAST") + ctrl.Log.Info("node list response (1)", "number of nodes is: ", len(nodeListMatching.Items)) + + // Check the len to be 1 else fail + if len(nodeListMatching.Items) != 1 { + ctrl.Log.Error(err, "Unexpected length on node list.", "length", len(nodeListMatching.Items)) + panic(err) + } + + for _, node := range nodeListMatching.Items { + ctrl.Log.Info("Matching node item", "name ", node.ObjectMeta.GetName()) + } + if node.ObjectMeta.GetName() != "node1" { + ctrl.Log.Error(err, "Unmatched label on node.") + panic(err) + } + assert.Nil(suite.T(), err) +} diff --git a/tests/shared/common.go b/tests/shared/common.go index 2855cd45f..fc48d6ae4 100644 --- a/tests/shared/common.go +++ b/tests/shared/common.go @@ -195,6 +195,19 @@ func MakePod(name, ns string) corev1.Pod { return podObj } +// MakeNode returns a node object +func MakeNode(name, ns string) corev1.Node { + nodeObj := corev1.Node{ + ObjectMeta: metav1.ObjectMeta{ + Name: name, + Namespace: ns, + Labels: map[string]string{}, + }, + } + + return nodeObj +} + // MakeReverseProxyModule returns a csireverseproxy object func MakeReverseProxyModule(_ string) csmv1.Module { revproxy := csmv1.Module{ diff --git a/tests/shared/crclient/client.go b/tests/shared/crclient/client.go index a6d1d0f42..ee6be3443 100644 --- a/tests/shared/crclient/client.go +++ b/tests/shared/crclient/client.go @@ -106,6 +106,8 @@ func (f Client) List(ctx context.Context, list client.ObjectList, _ ...client.Li switch l := list.(type) { case *corev1.PodList: return f.listPodList(l) + case *corev1.NodeList: + return f.listNodeList(l) case *appsv1.DeploymentList: return f.listDeploymentList(ctx, &appsv1.DeploymentList{}) default: @@ -122,6 +124,18 @@ func (f Client) listPodList(list *corev1.PodList) error { return nil } +func (f Client) listNodeList(list *corev1.NodeList) error { + for k, v := range f.Objects { + if k.Kind == "Node" { + node, ok := v.(*corev1.Node) + if ok { + list.Items = append(list.Items, *node) + } + } + } + return nil +} + func (f Client) listDeploymentList(_ context.Context, list *appsv1.DeploymentList) error { for k, v := range f.Objects { if k.Kind == "Deployment" { From 63c4d8e3653c664a0ae710d3d993fdc00631b82e Mon Sep 17 00:00:00 2001 From: Chiman Jain <36687396+chimanjain@users.noreply.github.com> Date: Mon, 9 Dec 2024 17:12:22 +0530 Subject: [PATCH 4/8] Updated the comments with proper default values of parameter in sample files. (#817) * modify default values in sample files * modify default values in sample files * updated default value of replicas --- samples/storage_csm_powerflex_v2101.yaml | 12 ++++++++++++ samples/storage_csm_powerflex_v2110.yaml | 12 ++++++++++++ samples/storage_csm_powerflex_v2120.yaml | 12 ++++++++++++ samples/storage_csm_powermax_v2101.yaml | 12 +++++++++++- samples/storage_csm_powermax_v2110.yaml | 12 +++++++++++- samples/storage_csm_powermax_v2120.yaml | 12 +++++++++++- samples/storage_csm_powerscale_v2101.yaml | 12 ++++++++++++ samples/storage_csm_powerscale_v2110.yaml | 12 ++++++++++++ samples/storage_csm_powerscale_v2120.yaml | 12 ++++++++++++ samples/storage_csm_powerstore_v2101.yaml | 2 ++ samples/storage_csm_powerstore_v2110.yaml | 2 ++ samples/storage_csm_powerstore_v2120.yaml | 2 ++ samples/storage_csm_unity_v2101.yaml | 4 ++++ samples/storage_csm_unity_v2110.yaml | 4 ++++ samples/storage_csm_unity_v2120.yaml | 4 ++++ 15 files changed, 123 insertions(+), 3 deletions(-) diff --git a/samples/storage_csm_powerflex_v2101.yaml b/samples/storage_csm_powerflex_v2101.yaml index f547e17ef..9a3f22419 100644 --- a/samples/storage_csm_powerflex_v2101.yaml +++ b/samples/storage_csm_powerflex_v2101.yaml @@ -18,6 +18,9 @@ spec: # false: disable storage capacity tracking storageCapacity: true configVersion: v2.10.1 + # Controller count + # Allowed values: n, where n > 0 + # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -45,6 +48,7 @@ spec: # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=k8s"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 @@ -67,6 +71,7 @@ spec: value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # Default monitor-interval: 60s - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -190,6 +195,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.10.1 components: @@ -197,19 +203,23 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -230,6 +240,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -257,6 +268,7 @@ spec: enabled: false - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics + # Default value: false enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed image: docker.io/dellemc/csm-metrics-powerflex:v1.8.1 diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 892a91204..c2d017d78 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -18,6 +18,9 @@ spec: # false: disable storage capacity tracking storageCapacity: true configVersion: v2.11.0 + # Controller count + # Allowed values: n, where n > 0 + # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -45,6 +48,7 @@ spec: # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=k8s"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 @@ -67,6 +71,7 @@ spec: value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # Default monitor-interval: 60s - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -190,6 +195,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization + # Default value: false enabled: false # For PowerFlex Tech-Preview v2.0.0-alpha use v1.11.0 as configVersion. # Do not change the configVersion to v2.0.0-alpha @@ -200,19 +206,23 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -233,6 +243,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -260,6 +271,7 @@ spec: enabled: false - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics + # Default value: false enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed image: docker.io/dellemc/csm-metrics-powerflex:v1.9.0 diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml index 273b0b41a..7a99a613c 100644 --- a/samples/storage_csm_powerflex_v2120.yaml +++ b/samples/storage_csm_powerflex_v2120.yaml @@ -18,6 +18,9 @@ spec: # false: disable storage capacity tracking storageCapacity: true configVersion: v2.12.0 + # Controller count + # Allowed values: n, where n > 0 + # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -52,6 +55,7 @@ spec: # 'k8s' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=k8s"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -74,6 +78,7 @@ spec: value: "10.xx.xx.xx,10.xx.xx.xx" # do not add mdm value here if it is present in secret # health monitor is disabled by default, refer to driver documentation before enabling it # Also set the env variable controller.envs.X_CSI_HEALTH_MONITOR_ENABLED to "true". + # Default monitor-interval: 60s - name: csi-external-health-monitor-controller enabled: false args: ["--monitor-interval=60s"] @@ -204,6 +209,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization + # Default value: false enabled: false # For PowerFlex Tech-Preview v2.0.0-alpha use v1.11.0 as configVersion. # Do not change the configVersion to v2.0.0-alpha @@ -214,19 +220,23 @@ spec: image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.10.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -247,6 +257,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -274,6 +285,7 @@ spec: enabled: false - name: metrics-powerflex # enabled: Enable/Disable PowerFlex metrics + # Default value: false enabled: false # image: Defines PowerFlex metrics image. This shouldn't be changed image: quay.io/dell/container-storage-modules/csm-metrics-powerflex:v1.10.0 diff --git a/samples/storage_csm_powermax_v2101.yaml b/samples/storage_csm_powermax_v2101.yaml index 9b4f76369..894e9879b 100644 --- a/samples/storage_csm_powermax_v2101.yaml +++ b/samples/storage_csm_powermax_v2101.yaml @@ -36,8 +36,9 @@ spec: configVersion: v2.10.1 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release + # Controller count # Allowed values: n, where n > 0 - # Default value: None + # Default value: 2 replicas: 2 # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds @@ -223,6 +224,7 @@ spec: # 'pmax' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + # Default volume-name-prefix: pmax args: ["--volume-name-prefix=pmax"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 @@ -235,6 +237,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -276,6 +279,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.10.1 components: @@ -283,9 +287,11 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # Replication: allows configuring replication module @@ -347,11 +353,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -372,6 +380,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -399,6 +408,7 @@ spec: enabled: false - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics + # Default value: false enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed image: docker.io/dellemc/csm-metrics-powermax:v1.3.1 diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index 0e6c4a614..37bea9620 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -35,8 +35,9 @@ spec: configVersion: v2.11.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release + # Controller count # Allowed values: n, where n > 0 - # Default value: None + # Default value: 2 replicas: 2 # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds @@ -233,6 +234,7 @@ spec: # 'pmax' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + # Default volume-name-prefix: pmax args: ["--volume-name-prefix=pmax"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 @@ -245,6 +247,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.8.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -285,6 +288,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.11.0 components: @@ -292,9 +296,11 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # Replication: allows configuring replication module @@ -356,11 +362,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -381,6 +389,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -408,6 +417,7 @@ spec: enabled: false - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics + # Default value: false enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed image: docker.io/dellemc/csm-metrics-powermax:v1.4.0 diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml index 2aea2c6fe..4a3eb789d 100644 --- a/samples/storage_csm_powermax_v2120.yaml +++ b/samples/storage_csm_powermax_v2120.yaml @@ -35,8 +35,9 @@ spec: configVersion: v2.12.0 # replica: Define the number of PowerMax controller nodes # to deploy to the Kubernetes release + # Controller count # Allowed values: n, where n > 0 - # Default value: None + # Default value: 2 replicas: 2 # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds @@ -202,6 +203,7 @@ spec: # 'pmax' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + # Default volume-name-prefix: pmax args: ["--volume-name-prefix=pmax"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -214,6 +216,7 @@ spec: - name: csi-metadata-retriever image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -251,6 +254,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enabled: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.12.0 components: @@ -258,9 +262,11 @@ spec: image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # Replication: allows configuring replication module @@ -322,11 +328,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.10.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -347,6 +355,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -374,6 +383,7 @@ spec: enabled: false - name: metrics-powermax # enabled: Enable/Disable PowerMax metrics + # Default value: false enabled: false # image: Defines PowerMax metrics image. This shouldn't be changed image: quay.io/dell/container-storage-modules/csm-metrics-powermax:v1.5.0 diff --git a/samples/storage_csm_powerscale_v2101.yaml b/samples/storage_csm_powerscale_v2101.yaml index d756f6ce1..df4e7e74e 100644 --- a/samples/storage_csm_powerscale_v2101.yaml +++ b/samples/storage_csm_powerscale_v2101.yaml @@ -20,6 +20,9 @@ spec: # Config version for CSI PowerScale v2.10.1 driver configVersion: v2.10.1 authSecret: isilon-creds + # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet # Uninstall CSI Driver and/or modules when CR is deleted @@ -236,6 +239,7 @@ spec: sideCars: - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=csipscale"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 @@ -248,6 +252,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -261,6 +266,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.10.1 components: @@ -268,9 +274,11 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.10.1 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # replication: allows to configure replication @@ -332,11 +340,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.8.1 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -357,6 +367,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -384,6 +395,7 @@ spec: enabled: false - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics + # Default value: false enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string diff --git a/samples/storage_csm_powerscale_v2110.yaml b/samples/storage_csm_powerscale_v2110.yaml index 8ef7c5cd9..a9b27b9a5 100644 --- a/samples/storage_csm_powerscale_v2110.yaml +++ b/samples/storage_csm_powerscale_v2110.yaml @@ -19,6 +19,9 @@ spec: storageCapacity: true configVersion: v2.11.0 authSecret: isilon-creds + # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet # Uninstall CSI Driver and/or modules when CR is deleted @@ -233,6 +236,7 @@ spec: sideCars: - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=csipscale"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 @@ -245,6 +249,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.8.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -258,6 +263,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.11.0 components: @@ -265,9 +271,11 @@ spec: image: docker.io/dellemc/csm-authorization-sidecar:v1.11.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # replication: allows to configure replication @@ -329,11 +337,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.9.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -354,6 +364,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -381,6 +392,7 @@ spec: enabled: false - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics + # Default value: false enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string diff --git a/samples/storage_csm_powerscale_v2120.yaml b/samples/storage_csm_powerscale_v2120.yaml index b4467d0e2..755890f9e 100644 --- a/samples/storage_csm_powerscale_v2120.yaml +++ b/samples/storage_csm_powerscale_v2120.yaml @@ -19,6 +19,9 @@ spec: storageCapacity: true configVersion: v2.12.0 authSecret: isilon-creds + # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet # Uninstall CSI Driver and/or modules when CR is deleted @@ -233,6 +236,7 @@ spec: sideCars: - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + # Default volume-name-prefix: k8s args: ["--volume-name-prefix=csipscale"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -245,6 +249,7 @@ spec: - name: csi-metadata-retriever image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor enabled: false args: ["--monitor-interval=60s"] @@ -258,6 +263,7 @@ spec: # Authorization: enable csm-authorization for RBAC - name: authorization # enable: Enable/Disable csm-authorization + # Default value: false enabled: false configVersion: v1.12.0 components: @@ -265,9 +271,11 @@ spec: image: quay.io/dell/container-storage-modules/csm-authorization-sidecar:v1.12.0 envs: # proxyHost: hostname of the csm-authorization server + # Default value: none - name: "PROXY_HOST" value: "csm-authorization.com" # skipCertificateValidation: Enable/Disable certificate validation of the csm-authorization server + # Default value: "true" - name: "SKIP_CERTIFICATE_VALIDATION" value: "true" # replication: allows to configure replication @@ -329,11 +337,13 @@ spec: # observability: allows to configure observability - name: observability # enabled: Enable/Disable observability + # Default value: false enabled: false configVersion: v1.10.0 components: - name: topology # enabled: Enable/Disable topology + # Default value: false enabled: false # image: Defines karavi-topology image. This shouldn't be changed # Allowed values: string @@ -354,6 +364,7 @@ spec: value: "INFO" - name: otel-collector # enabled: Enable/Disable OpenTelemetry Collector + # Default value: false enabled: false # image: Defines otel-collector image. This shouldn't be changed # Allowed values: string @@ -381,6 +392,7 @@ spec: enabled: false - name: metrics-powerscale # enabled: Enable/Disable PowerScale metrics + # Default value: false enabled: false # image: Defines PowerScale metrics image. This shouldn't be changed # Allowed values: string diff --git a/samples/storage_csm_powerstore_v2101.yaml b/samples/storage_csm_powerstore_v2101.yaml index 558e06c1a..443f913df 100644 --- a/samples/storage_csm_powerstore_v2101.yaml +++ b/samples/storage_csm_powerstore_v2101.yaml @@ -39,6 +39,8 @@ spec: # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config authSecret: powerstore-config # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/samples/storage_csm_powerstore_v2110.yaml b/samples/storage_csm_powerstore_v2110.yaml index 972bb27f1..3a7d9265d 100644 --- a/samples/storage_csm_powerstore_v2110.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -38,6 +38,8 @@ spec: # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config authSecret: powerstore-config # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/samples/storage_csm_powerstore_v2120.yaml b/samples/storage_csm_powerstore_v2120.yaml index 0e5f4a382..7f4fb09c7 100644 --- a/samples/storage_csm_powerstore_v2120.yaml +++ b/samples/storage_csm_powerstore_v2120.yaml @@ -38,6 +38,8 @@ spec: # For example: If the metadataName is set to powerstore, authSecret value should be set to powerstore-config authSecret: powerstore-config # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false diff --git a/samples/storage_csm_unity_v2101.yaml b/samples/storage_csm_unity_v2101.yaml index 3c29695e8..aa62c0f64 100644 --- a/samples/storage_csm_unity_v2101.yaml +++ b/samples/storage_csm_unity_v2101.yaml @@ -20,6 +20,8 @@ spec: # Config version for CSI Unity v2.10.1 driver configVersion: v2.10.1 # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -83,6 +85,7 @@ spec: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v4.0.0 + # Default volume-name-prefix: csivol args: ["--volume-name-prefix=csivol"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.5.0 @@ -95,6 +98,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.7.3 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity # Configure when the storageCapacity is set as "true" diff --git a/samples/storage_csm_unity_v2110.yaml b/samples/storage_csm_unity_v2110.yaml index 26881293a..b24d1038e 100644 --- a/samples/storage_csm_unity_v2110.yaml +++ b/samples/storage_csm_unity_v2110.yaml @@ -19,6 +19,8 @@ spec: storageCapacity: true configVersion: v2.11.0 # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -86,6 +88,7 @@ spec: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.0.1 + # Default volume-name-prefix: csivol args: ["--volume-name-prefix=csivol"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.6.1 @@ -98,6 +101,7 @@ spec: - name: csi-metadata-retriever image: docker.io/dellemc/csi-metadata-retriever:v1.8.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity # Configure when the storageCapacity is set as "true" diff --git a/samples/storage_csm_unity_v2120.yaml b/samples/storage_csm_unity_v2120.yaml index 74af9912b..26eae84b0 100644 --- a/samples/storage_csm_unity_v2120.yaml +++ b/samples/storage_csm_unity_v2120.yaml @@ -19,6 +19,8 @@ spec: storageCapacity: true configVersion: v2.12.0 # Controller count + # Allowed values: n, where n > 0 + # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet forceUpdate: false @@ -86,6 +88,7 @@ spec: # 'csivol' represents a string prepended to each volume created by the CSI driver - name: provisioner image: registry.k8s.io/sig-storage/csi-provisioner:v5.1.0 + # Default volume-name-prefix: csivol args: ["--volume-name-prefix=csivol"] - name: attacher image: registry.k8s.io/sig-storage/csi-attacher:v4.7.0 @@ -98,6 +101,7 @@ spec: - name: csi-metadata-retriever image: quay.io/dell/container-storage-modules/csi-metadata-retriever:v1.9.0 # health monitor is disabled by default, refer to driver documentation before enabling it + # Default monitor-interval: 60s - name: external-health-monitor # Uncomment the following to configure how often external-provisioner polls the driver to detect changed capacity # Configure when the storageCapacity is set as "true" From be3d939ab5fab547ea48a3e74a41c1f7ddd8e0e8 Mon Sep 17 00:00:00 2001 From: HarishH-DELL <109663924+HarishH-DELL@users.noreply.github.com> Date: Mon, 9 Dec 2024 18:03:06 +0530 Subject: [PATCH 5/8] Removed refernce for ForceUpdate (#816) --- api/v1/types.go | 4 ---- .../dell-csm-operator.clusterserviceversion.yaml | 9 --------- .../storage.dell.com_containerstoragemodules.yaml | 5 ----- .../bases/storage.dell.com_containerstoragemodules.yaml | 5 ----- .../bases/dell-csm-operator.clusterserviceversion.yaml | 5 ----- config/samples/storage_v1_csm_powerflex.yaml | 1 - config/samples/storage_v1_csm_powermax.yaml | 1 - config/samples/storage_v1_csm_powerstore.yaml | 1 - config/samples/storage_v1_csm_unity.yaml | 1 - deploy/crds/storage.dell.com.crds.all.yaml | 5 ----- pkg/modules/testdata/cr_powerflex_observability.yaml | 1 - .../testdata/cr_powerflex_observability_custom_cert.yaml | 1 - ..._powerflex_observability_custom_cert_missing_key.yaml | 1 - pkg/modules/testdata/cr_powerflex_replica.yaml | 1 - pkg/modules/testdata/cr_powerflex_resiliency.yaml | 1 - samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml | 1 - samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml | 1 - samples/ocp/1.6.0/storage_csm_powerstore_v2110.yaml | 1 - samples/ocp/1.6.0/storage_csm_unity_v2110.yaml | 1 - samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml | 1 - samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml | 1 - samples/ocp/1.6.1/storage_csm_powerstore_v2111.yaml | 1 - samples/ocp/1.6.1/storage_csm_unity_v2111.yaml | 1 - samples/ocp/1.7.0/storage_csm_powerflex_v2120.yaml | 1 - samples/ocp/1.7.0/storage_csm_powermax_v2120.yaml | 1 - samples/ocp/1.7.0/storage_csm_powerstore_v2120.yaml | 1 - samples/ocp/1.7.0/storage_csm_unity_v2120.yaml | 1 - samples/storage_csm_powerflex_v2101.yaml | 1 - samples/storage_csm_powerflex_v2110.yaml | 1 - samples/storage_csm_powerflex_v2120.yaml | 1 - samples/storage_csm_powermax_v2101.yaml | 1 - samples/storage_csm_powermax_v2110.yaml | 1 - samples/storage_csm_powermax_v2120.yaml | 1 - samples/storage_csm_powerstore_v2101.yaml | 1 - samples/storage_csm_powerstore_v2110.yaml | 1 - samples/storage_csm_powerstore_v2120.yaml | 1 - samples/storage_csm_unity_v2101.yaml | 1 - samples/storage_csm_unity_v2110.yaml | 1 - samples/storage_csm_unity_v2120.yaml | 1 - .../csm_application_mobility_n_minus_1.yaml | 1 - .../csm_application_mobility_n_minus_2.yaml | 1 - .../csm_application_mobility_no_velero.yaml | 1 - .../csm_application_mobility_with_pflex.yaml | 1 - .../csm_application_mobility_with_pflex_alt.yaml | 1 - .../application-mobility-templates/powerflex_noAM.yaml | 1 - tests/e2e/testfiles/storage_csm_powerflex.yaml | 1 - .../e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml | 1 - .../e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml | 1 - .../e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml | 1 - .../e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml | 1 - tests/e2e/testfiles/storage_csm_powerflex_auth.yaml | 1 - .../storage_csm_powerflex_auth_driver_only_upgrade.yaml | 1 - .../testfiles/storage_csm_powerflex_auth_n_minus_1.yaml | 1 - tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml | 1 - .../testfiles/storage_csm_powerflex_health_monitor.yaml | 1 - tests/e2e/testfiles/storage_csm_powerflex_no_sdc.yaml | 1 - .../testfiles/storage_csm_powerflex_observability.yaml | 1 - .../storage_csm_powerflex_observability_auth.yaml | 1 - .../storage_csm_powerflex_observability_custom_cert.yaml | 1 - ...age_csm_powerflex_observability_otel_custom_cert.yaml | 1 - tests/e2e/testfiles/storage_csm_powerflex_replica.yaml | 1 - .../e2e/testfiles/storage_csm_powerflex_resiliency.yaml | 1 - tests/e2e/testfiles/storage_csm_powermax.yaml | 1 - .../testfiles/storage_csm_powermax_authorization.yaml | 1 - .../testfiles/storage_csm_powermax_observability.yaml | 1 - ...storage_csm_powermax_observability_authorization.yaml | 1 - tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml | 1 - .../storage_csm_powermax_reverseproxy_authorization.yaml | 1 - tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml | 1 - tests/e2e/testfiles/storage_csm_powerscale_auth.yaml | 1 - tests/e2e/testfiles/storage_csm_powerstore.yaml | 1 - .../e2e/testfiles/storage_csm_powerstore_resiliency.yaml | 1 - tests/e2e/testfiles/storage_csm_unity.yaml | 1 - 73 files changed, 100 deletions(-) diff --git a/api/v1/types.go b/api/v1/types.go index 0bb5079c9..0100df19b 100644 --- a/api/v1/types.go +++ b/api/v1/types.go @@ -216,10 +216,6 @@ type Driver struct { // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Snapshot Classes" SnapshotClass []SnapshotClass `json:"snapshotClass,omitempty" yaml:"snapshotClass"` - // ForceUpdate is the boolean flag used to force an update of the driver instance - // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Force update" - ForceUpdate bool `json:"forceUpdate,omitempty" yaml:"forceUpdate"` - // AuthSecret is the name of the credentials secret for the driver // +operator-sdk:csv:customresourcedefinitions:type=spec,displayName="Auth Secret" AuthSecret string `json:"authSecret,omitempty" yaml:"authSecret"` diff --git a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml index 421f996d5..60d9c534a 100644 --- a/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml +++ b/bundle/manifests/dell-csm-operator.clusterserviceversion.yaml @@ -535,7 +535,6 @@ metadata: "csiDriverType": "powermax", "dnsPolicy": "ClusterFirstWithHostNet", "forceRemoveDriver": true, - "forceUpdate": false, "node": { "envs": [ { @@ -899,7 +898,6 @@ metadata: "csiDriverType": "powerstore", "dnsPolicy": "ClusterFirstWithHostNet", "forceRemoveDriver": true, - "forceUpdate": false, "node": { "envs": [ { @@ -1080,7 +1078,6 @@ metadata: "csiDriverType": "unity", "dnsPolicy": "ClusterFirstWithHostNet", "forceRemoveDriver": true, - "forceUpdate": false, "node": { "envs": [ { @@ -1197,7 +1194,6 @@ metadata: "csiDriverType": "powerflex", "dnsPolicy": "ClusterFirstWithHostNet", "forceRemoveDriver": true, - "forceUpdate": false, "initContainers": [ { "envs": [ @@ -1997,11 +1993,6 @@ spec: when CR is deleted displayName: Force Remove Driver path: driver.forceRemoveDriver - - description: - ForceUpdate is the boolean flag used to force an update of the - driver instance - displayName: Force update - path: driver.forceUpdate - description: Args is the set of arguments for the container displayName: Container Arguments path: driver.initContainers[0].args diff --git a/bundle/manifests/storage.dell.com_containerstoragemodules.yaml b/bundle/manifests/storage.dell.com_containerstoragemodules.yaml index d8c4a19de..bdf6d4f23 100644 --- a/bundle/manifests/storage.dell.com_containerstoragemodules.yaml +++ b/bundle/manifests/storage.dell.com_containerstoragemodules.yaml @@ -991,11 +991,6 @@ spec: ForceRemoveDriver is the boolean flag used to remove driver deployment when CR is deleted type: boolean - forceUpdate: - description: - ForceUpdate is the boolean flag used to force an - update of the driver instance - type: boolean initContainers: description: InitContainers is the specification for Driver InitContainers items: diff --git a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml index 3592443b8..206505e87 100644 --- a/config/crd/bases/storage.dell.com_containerstoragemodules.yaml +++ b/config/crd/bases/storage.dell.com_containerstoragemodules.yaml @@ -991,11 +991,6 @@ spec: ForceRemoveDriver is the boolean flag used to remove driver deployment when CR is deleted type: boolean - forceUpdate: - description: - ForceUpdate is the boolean flag used to force an - update of the driver instance - type: boolean initContainers: description: InitContainers is the specification for Driver InitContainers items: diff --git a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml index f289864f1..51ea624ae 100644 --- a/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/dell-csm-operator.clusterserviceversion.yaml @@ -502,11 +502,6 @@ spec: when CR is deleted displayName: Force Remove Driver path: driver.forceRemoveDriver - - description: - ForceUpdate is the boolean flag used to force an update of the - driver instance - displayName: Force update - path: driver.forceUpdate - description: Args is the set of arguments for the container displayName: Container Arguments path: driver.initContainers[0].args diff --git a/config/samples/storage_v1_csm_powerflex.yaml b/config/samples/storage_v1_csm_powerflex.yaml index 2cd1fafdf..e5ff7d325 100644 --- a/config/samples/storage_v1_csm_powerflex.yaml +++ b/config/samples/storage_v1_csm_powerflex.yaml @@ -20,7 +20,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0" diff --git a/config/samples/storage_v1_csm_powermax.yaml b/config/samples/storage_v1_csm_powermax.yaml index 9ae4517dd..f22f7ca27 100644 --- a/config/samples/storage_v1_csm_powermax.yaml +++ b/config/samples/storage_v1_csm_powermax.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 diff --git a/config/samples/storage_v1_csm_powerstore.yaml b/config/samples/storage_v1_csm_powerstore.yaml index f5fdc1d29..d190cc444 100644 --- a/config/samples/storage_v1_csm_powerstore.yaml +++ b/config/samples/storage_v1_csm_powerstore.yaml @@ -40,7 +40,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0" diff --git a/config/samples/storage_v1_csm_unity.yaml b/config/samples/storage_v1_csm_unity.yaml index bfb82dcb8..bfa968be6 100644 --- a/config/samples/storage_v1_csm_unity.yaml +++ b/config/samples/storage_v1_csm_unity.yaml @@ -21,7 +21,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-unity:v2.12.0" diff --git a/deploy/crds/storage.dell.com.crds.all.yaml b/deploy/crds/storage.dell.com.crds.all.yaml index 76b1733dd..24ba23c26 100644 --- a/deploy/crds/storage.dell.com.crds.all.yaml +++ b/deploy/crds/storage.dell.com.crds.all.yaml @@ -990,11 +990,6 @@ spec: ForceRemoveDriver is the boolean flag used to remove driver deployment when CR is deleted type: boolean - forceUpdate: - description: - ForceUpdate is the boolean flag used to force an - update of the driver instance - type: boolean initContainers: description: InitContainers is the specification for Driver InitContainers items: diff --git a/pkg/modules/testdata/cr_powerflex_observability.yaml b/pkg/modules/testdata/cr_powerflex_observability.yaml index e7028a84a..f756f01d9 100644 --- a/pkg/modules/testdata/cr_powerflex_observability.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-powermax:v2.12.0" diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml index 3d4d256a4..c0747dfd0 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0" diff --git a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml index 7b1e7d544..7d08b5e50 100644 --- a/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml +++ b/pkg/modules/testdata/cr_powerflex_observability_custom_cert_missing_key.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0" diff --git a/pkg/modules/testdata/cr_powerflex_replica.yaml b/pkg/modules/testdata/cr_powerflex_replica.yaml index 585637a01..0a1e8f27e 100644 --- a/pkg/modules/testdata/cr_powerflex_replica.yaml +++ b/pkg/modules/testdata/cr_powerflex_replica.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true modules: - name: replication diff --git a/pkg/modules/testdata/cr_powerflex_resiliency.yaml b/pkg/modules/testdata/cr_powerflex_resiliency.yaml index 7b6487d3c..aeabeedf5 100644 --- a/pkg/modules/testdata/cr_powerflex_resiliency.yaml +++ b/pkg/modules/testdata/cr_powerflex_resiliency.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true modules: - name: resiliency diff --git a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml index 6545a04eb..089b7a60b 100644 --- a/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powerflex_v2110.yaml @@ -20,7 +20,6 @@ spec: configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-vxflexos@sha256:a4e96d11be8920f01b273748a8cf8cfc60515403640f77f101a13f7d79056e23" diff --git a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml index 0175e4e1a..52f759daa 100644 --- a/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powermax_v2110.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: registry.connect.redhat.com/dell-emc/csi-powermax@sha256:313ab1390a66f4fc9b47bde65bb135685adc5ec30108798c6254f8a34232f10e diff --git a/samples/ocp/1.6.0/storage_csm_powerstore_v2110.yaml b/samples/ocp/1.6.0/storage_csm_powerstore_v2110.yaml index 3c684dfb7..55da607e9 100644 --- a/samples/ocp/1.6.0/storage_csm_powerstore_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_powerstore_v2110.yaml @@ -40,7 +40,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-powerstore@sha256:11d498da9977b57608b308e6ce36427aaa95aac7ce95bc59e95b036c7d38b043" diff --git a/samples/ocp/1.6.0/storage_csm_unity_v2110.yaml b/samples/ocp/1.6.0/storage_csm_unity_v2110.yaml index 4201060e2..6757b41f3 100644 --- a/samples/ocp/1.6.0/storage_csm_unity_v2110.yaml +++ b/samples/ocp/1.6.0/storage_csm_unity_v2110.yaml @@ -21,7 +21,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-unity@sha256:5ffef0bbaad3ae5b658c5be0d9704715964ed818a18af1552159907114f7b5f2" diff --git a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml index 3b82af4c7..0e30d7afa 100644 --- a/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powerflex_v2110.yaml @@ -20,7 +20,6 @@ spec: configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-vxflexos@sha256:a4e96d11be8920f01b273748a8cf8cfc60515403640f77f101a13f7d79056e23" diff --git a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml index 74da52beb..0656396af 100644 --- a/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml +++ b/samples/ocp/1.6.1/storage_csm_powermax_v2110.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: registry.connect.redhat.com/dell-emc/csi-powermax@sha256:313ab1390a66f4fc9b47bde65bb135685adc5ec30108798c6254f8a34232f10e diff --git a/samples/ocp/1.6.1/storage_csm_powerstore_v2111.yaml b/samples/ocp/1.6.1/storage_csm_powerstore_v2111.yaml index 833db720b..83214ca62 100644 --- a/samples/ocp/1.6.1/storage_csm_powerstore_v2111.yaml +++ b/samples/ocp/1.6.1/storage_csm_powerstore_v2111.yaml @@ -40,7 +40,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-powerstore@sha256:e26eb114d74bcd3935f252d179fc777e122ad089b3dbc29f16d7a642648608d8" diff --git a/samples/ocp/1.6.1/storage_csm_unity_v2111.yaml b/samples/ocp/1.6.1/storage_csm_unity_v2111.yaml index 19eea9afc..e419d8edb 100644 --- a/samples/ocp/1.6.1/storage_csm_unity_v2111.yaml +++ b/samples/ocp/1.6.1/storage_csm_unity_v2111.yaml @@ -21,7 +21,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/csi-unity@sha256:7f2abaf2c6dd92abc2824f4adc0aac929844452692e9c99cd7cdb99df1f7e129" diff --git a/samples/ocp/1.7.0/storage_csm_powerflex_v2120.yaml b/samples/ocp/1.7.0/storage_csm_powerflex_v2120.yaml index 54e74881f..0eb3e1259 100644 --- a/samples/ocp/1.7.0/storage_csm_powerflex_v2120.yaml +++ b/samples/ocp/1.7.0/storage_csm_powerflex_v2120.yaml @@ -20,7 +20,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/dell-csm-powerflex@sha256:7d0d92fb2ddcdf4eae6244acfe8469d64683986a558cd500ee601af3a9f3b7be" diff --git a/samples/ocp/1.7.0/storage_csm_powermax_v2120.yaml b/samples/ocp/1.7.0/storage_csm_powermax_v2120.yaml index ba26c806e..c1a9a6866 100644 --- a/samples/ocp/1.7.0/storage_csm_powermax_v2120.yaml +++ b/samples/ocp/1.7.0/storage_csm_powermax_v2120.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: registry.connect.redhat.com/dell-emc/dell-csm-powermax@sha256:2b550fcf51f8d011e6b9e5de9199df550dcf1439bef110ae72dc9c30e1e3a709 diff --git a/samples/ocp/1.7.0/storage_csm_powerstore_v2120.yaml b/samples/ocp/1.7.0/storage_csm_powerstore_v2120.yaml index e5dd9febd..6d67f7fe5 100644 --- a/samples/ocp/1.7.0/storage_csm_powerstore_v2120.yaml +++ b/samples/ocp/1.7.0/storage_csm_powerstore_v2120.yaml @@ -40,7 +40,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/dell-csm-powerstore@sha256:90abb176aee36eab94da2462324cfe8820672299ab25ece67291add30731dd55" diff --git a/samples/ocp/1.7.0/storage_csm_unity_v2120.yaml b/samples/ocp/1.7.0/storage_csm_unity_v2120.yaml index 15840d3dd..5aa243de7 100644 --- a/samples/ocp/1.7.0/storage_csm_unity_v2120.yaml +++ b/samples/ocp/1.7.0/storage_csm_unity_v2120.yaml @@ -21,7 +21,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "registry.connect.redhat.com/dell-emc/dell-csm-unity@sha256:969b8c40628c7c46e2fdec84ab2310c48f2dee9c75d106380da88cf6821ad97b" diff --git a/samples/storage_csm_powerflex_v2101.yaml b/samples/storage_csm_powerflex_v2101.yaml index 9a3f22419..94a8fd6f5 100644 --- a/samples/storage_csm_powerflex_v2101.yaml +++ b/samples/storage_csm_powerflex_v2101.yaml @@ -23,7 +23,6 @@ spec: # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "docker.io/dellemc/csi-vxflexos:v2.10.1" diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index c2d017d78..884bd1e5a 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -23,7 +23,6 @@ spec: # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "docker.io/dellemc/csi-vxflexos:v2.11.0" diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml index 7a99a613c..920f428d3 100644 --- a/samples/storage_csm_powerflex_v2120.yaml +++ b/samples/storage_csm_powerflex_v2120.yaml @@ -23,7 +23,6 @@ spec: # Default value: 1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:v2.12.0" diff --git a/samples/storage_csm_powermax_v2101.yaml b/samples/storage_csm_powermax_v2101.yaml index 894e9879b..8acbf1d98 100644 --- a/samples/storage_csm_powermax_v2101.yaml +++ b/samples/storage_csm_powermax_v2101.yaml @@ -43,7 +43,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.10.1 diff --git a/samples/storage_csm_powermax_v2110.yaml b/samples/storage_csm_powermax_v2110.yaml index 37bea9620..e9a55a2f5 100644 --- a/samples/storage_csm_powermax_v2110.yaml +++ b/samples/storage_csm_powermax_v2110.yaml @@ -42,7 +42,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: docker.io/dellemc/csi-powermax:v2.11.0 diff --git a/samples/storage_csm_powermax_v2120.yaml b/samples/storage_csm_powermax_v2120.yaml index 4a3eb789d..e48127480 100644 --- a/samples/storage_csm_powermax_v2120.yaml +++ b/samples/storage_csm_powermax_v2120.yaml @@ -42,7 +42,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: quay.io/dell/container-storage-modules/csi-powermax:v2.12.0 diff --git a/samples/storage_csm_powerstore_v2101.yaml b/samples/storage_csm_powerstore_v2101.yaml index 443f913df..5beb1335b 100644 --- a/samples/storage_csm_powerstore_v2101.yaml +++ b/samples/storage_csm_powerstore_v2101.yaml @@ -43,7 +43,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerStore driver v2.10.1 diff --git a/samples/storage_csm_powerstore_v2110.yaml b/samples/storage_csm_powerstore_v2110.yaml index 3a7d9265d..1ee26902f 100644 --- a/samples/storage_csm_powerstore_v2110.yaml +++ b/samples/storage_csm_powerstore_v2110.yaml @@ -42,7 +42,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "docker.io/dellemc/csi-powerstore:v2.11.0" diff --git a/samples/storage_csm_powerstore_v2120.yaml b/samples/storage_csm_powerstore_v2120.yaml index 7f4fb09c7..c759232b7 100644 --- a/samples/storage_csm_powerstore_v2120.yaml +++ b/samples/storage_csm_powerstore_v2120.yaml @@ -42,7 +42,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-powerstore:v2.12.0" diff --git a/samples/storage_csm_unity_v2101.yaml b/samples/storage_csm_unity_v2101.yaml index aa62c0f64..b5d383011 100644 --- a/samples/storage_csm_unity_v2101.yaml +++ b/samples/storage_csm_unity_v2101.yaml @@ -24,7 +24,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI Unity driver v2.10.1 diff --git a/samples/storage_csm_unity_v2110.yaml b/samples/storage_csm_unity_v2110.yaml index b24d1038e..c42b39780 100644 --- a/samples/storage_csm_unity_v2110.yaml +++ b/samples/storage_csm_unity_v2110.yaml @@ -23,7 +23,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "docker.io/dellemc/csi-unity:v2.11.0" diff --git a/samples/storage_csm_unity_v2120.yaml b/samples/storage_csm_unity_v2120.yaml index 26eae84b0..123f62a95 100644 --- a/samples/storage_csm_unity_v2120.yaml +++ b/samples/storage_csm_unity_v2120.yaml @@ -23,7 +23,6 @@ spec: # Default value: 2 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-unity:v2.12.0" diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_1.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_1.yaml index 39c18a1ee..13f14cef4 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_1.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_1.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_2.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_2.yaml index f9f12701c..fcde2dd8d 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_2.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_n_minus_2.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.10.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_no_velero.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_no_velero.yaml index 493fc5a88..d65347698 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_no_velero.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_no_velero.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml index ffd237e30..44a2d6b3b 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml index e0c77cf97..f5b0d64e9 100644 --- a/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/csm_application_mobility_with_pflex_alt.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml b/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml index 802731c8a..5ad8cbcb5 100644 --- a/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml +++ b/tests/e2e/testfiles/application-mobility-templates/powerflex_noAM.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex.yaml b/tests/e2e/testfiles/storage_csm_powerflex.yaml index 7d530c3ba..139246630 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml index 7728afd04..56a3421f5 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_1.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: true forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml index 787d65a5b..f2a80e607 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_2.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: false common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml index a720950b7..581aeddf4 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_3.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml index 8476d2e58..43184cde5 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_alt_vals_4.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml index f4a710f24..a8a07943c 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: quay.io/dell/container-storage-modules/csi-vxflexos:nightly diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml index 99d0d405d..3bcaf8440 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth_driver_only_upgrade.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.11.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml index 80f277f07..2318ba756 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_auth_n_minus_1.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.10.1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:v2.10.1" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml index 16b41cbef..0831de7ad 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_downgrade.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.10.1 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:v2.10.1" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml index 357f6d8eb..a78bb6fea 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_health_monitor.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_no_sdc.yaml b/tests/e2e/testfiles/storage_csm_powerflex_no_sdc.yaml index a68bfdca2..046f85e81 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_no_sdc.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_no_sdc.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml index 8e2500d88..8d7cdb683 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml index 5f5652531..270d913a7 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_auth.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml index 51ec0bfdc..485b124b0 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_custom_cert.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml index 0c0c63ee9..3fb09e50d 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_observability_otel_custom_cert.yaml @@ -14,7 +14,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml index 2243b25be..32f51fa1d 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_replica.yaml @@ -19,7 +19,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "dellemc/csi-vxflexos:v2.11.0" diff --git a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml index 1471a2867..32c7c5b5d 100644 --- a/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerflex_resiliency.yaml @@ -30,7 +30,6 @@ spec: configVersion: v2.12.0 replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-vxflexos:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powermax.yaml b/tests/e2e/testfiles/storage_csm_powermax.yaml index 924fa1a91..67b68d99f 100644 --- a/tests/e2e/testfiles/storage_csm_powermax.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.12.0 diff --git a/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml index e94cdb7d3..f24b73104 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_authorization.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: quay.io/dell/container-storage-modules/csi-powermax:nightly diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml index 074b7a6b0..da30617e3 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.12.0 diff --git a/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml index 3ec92763e..8b9b1a684 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_observability_authorization.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: quay.io/dell/container-storage-modules/csi-powermax:nightly diff --git a/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml index 2c357589c..edb26077e 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_resiliency.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.12.0 diff --git a/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml b/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml index 131e12545..9f03aa9d8 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_reverseproxy_authorization.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.12.0 diff --git a/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml b/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml index 15da84f16..3febd25c4 100644 --- a/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml +++ b/tests/e2e/testfiles/storage_csm_powermax_sidecar.yaml @@ -41,7 +41,6 @@ spec: # Default credential secret for Powermax, if not set it to "" authSecret: powermax-creds dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: # Image for CSI PowerMax driver v2.12.0 diff --git a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml index b42d82723..606d4d1c0 100644 --- a/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml +++ b/tests/e2e/testfiles/storage_csm_powerscale_auth.yaml @@ -15,7 +15,6 @@ spec: authSecret: isilon-creds-auth replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: true common: image: "quay.io/dell/container-storage-modules/csi-isilon:nightly" imagePullPolicy: IfNotPresent diff --git a/tests/e2e/testfiles/storage_csm_powerstore.yaml b/tests/e2e/testfiles/storage_csm_powerstore.yaml index b5d73e7d6..19d97b6a0 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore.yaml @@ -33,7 +33,6 @@ spec: # Controller count replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-powerstore:nightly" diff --git a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml index 68065cd97..4866c4092 100644 --- a/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml +++ b/tests/e2e/testfiles/storage_csm_powerstore_resiliency.yaml @@ -33,7 +33,6 @@ spec: # Controller count replicas: 2 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: true forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-powerstore:nightly" diff --git a/tests/e2e/testfiles/storage_csm_unity.yaml b/tests/e2e/testfiles/storage_csm_unity.yaml index 57a024a27..c7162300c 100644 --- a/tests/e2e/testfiles/storage_csm_unity.yaml +++ b/tests/e2e/testfiles/storage_csm_unity.yaml @@ -20,7 +20,6 @@ spec: # Controller count replicas: 1 dnsPolicy: ClusterFirstWithHostNet - forceUpdate: false forceRemoveDriver: true common: image: "quay.io/dell/container-storage-modules/csi-unity:nightly" From 200c6998c14ae058f643e5d88dd3702d6288836c Mon Sep 17 00:00:00 2001 From: shefali-malhotra <91597668+shefali-malhotra@users.noreply.github.com> Date: Tue, 10 Dec 2024 16:11:39 +0530 Subject: [PATCH 6/8] updated the comment for fSGroupPolicy in powerflex samples (#820) Signed-off-by: shefali-malhotra --- samples/storage_csm_powerflex_v2101.yaml | 2 +- samples/storage_csm_powerflex_v2110.yaml | 2 +- samples/storage_csm_powerflex_v2120.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/samples/storage_csm_powerflex_v2101.yaml b/samples/storage_csm_powerflex_v2101.yaml index 94a8fd6f5..9a0d2aeb9 100644 --- a/samples/storage_csm_powerflex_v2101.yaml +++ b/samples/storage_csm_powerflex_v2101.yaml @@ -10,7 +10,7 @@ spec: # in OCP <= 4.16 and K8s <= 1.29, fsGroupPolicy is an immutable field # 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 + # Default value: File fSGroupPolicy: "File" # storageCapacity: Helps the scheduler to schedule the pod on a node satisfying the topology constraints, only if the requested capacity is available on the storage array # Allowed values: diff --git a/samples/storage_csm_powerflex_v2110.yaml b/samples/storage_csm_powerflex_v2110.yaml index 884bd1e5a..febaaab10 100644 --- a/samples/storage_csm_powerflex_v2110.yaml +++ b/samples/storage_csm_powerflex_v2110.yaml @@ -10,7 +10,7 @@ spec: # in OCP <= 4.16 and K8s <= 1.29, fsGroupPolicy is an immutable field # 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 + # Default value: File fSGroupPolicy: "File" # storageCapacity: Helps the scheduler to schedule the pod on a node satisfying the topology constraints, only if the requested capacity is available on the storage array # Allowed values: diff --git a/samples/storage_csm_powerflex_v2120.yaml b/samples/storage_csm_powerflex_v2120.yaml index 920f428d3..e48af8cff 100644 --- a/samples/storage_csm_powerflex_v2120.yaml +++ b/samples/storage_csm_powerflex_v2120.yaml @@ -10,7 +10,7 @@ spec: # in OCP <= 4.16 and K8s <= 1.29, fsGroupPolicy is an immutable field # 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 + # Default value: File fSGroupPolicy: "File" # storageCapacity: Helps the scheduler to schedule the pod on a node satisfying the topology constraints, only if the requested capacity is available on the storage array # Allowed values: From 6e3737c25abebc3618c59eb7ebbb0c6f7dc059a5 Mon Sep 17 00:00:00 2001 From: EvgenyUglov <63835199+EvgenyUglov@users.noreply.github.com> Date: Tue, 10 Dec 2024 14:08:38 -0500 Subject: [PATCH 7/8] Fix multi array zone info (#819) --- pkg/drivers/powerflex.go | 11 ++++------- pkg/drivers/powerflex_test.go | 36 ++++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/pkg/drivers/powerflex.go b/pkg/drivers/powerflex.go index 56d88e4ba..883ce6787 100644 --- a/pkg/drivers/powerflex.go +++ b/pkg/drivers/powerflex.go @@ -359,8 +359,7 @@ func ExtractZonesFromSecret(ctx context.Context, kube client.Client, namespace s type StorageArrayConfig struct { SystemID string `json:"systemId"` Zone struct { - Name string `json:"name"` - LabelKey string `json:"labelKey"` + Name string `json:"name"` } `json:"zone"` } @@ -383,11 +382,9 @@ func ExtractZonesFromSecret(ctx context.Context, kube client.Client, namespace s if configParam.SystemID == "" { return nil, fmt.Errorf("invalid value for SystemID") } - if configParam.Zone.LabelKey != "" { - if configParam.Zone.Name != "" { - zonesMapData[configParam.Zone.LabelKey] = configParam.Zone.Name - log.Infof("Zoning information configured for systemID %s: %v ", configParam.SystemID, zonesMapData) - } + if configParam.Zone.Name != "" { + zonesMapData[configParam.SystemID] = configParam.Zone.Name + log.Infof("Zoning information configured for systemID %s: %v ", configParam.SystemID, zonesMapData) } else { log.Info("Zoning information not found in the array config. Continue with topology-unaware driver installation mode") return zonesMapData, nil diff --git a/pkg/drivers/powerflex_test.go b/pkg/drivers/powerflex_test.go index 79b14ecab..03f0fade6 100644 --- a/pkg/drivers/powerflex_test.go +++ b/pkg/drivers/powerflex_test.go @@ -220,6 +220,26 @@ func TestExtractZonesFromSecret(t *testing.T) { zone: name: "US-EAST" labelKey: "zone.csi-vxflexos.dellemc.com" +` + zoneDataWithMultiArray := ` +- username: "admin" + password: "password" + systemID: "2b11bb111111bb1b" + endpoint: "https://127.0.0.2" + skipCertificateValidation: true + mdm: "10.0.0.3,10.0.0.4" + zone: + name: "ZONE-1" + labelKey: "zone.csi-vxflexos.dellemc.com" +- username: "admin" + password: "password" + systemID: "1a99aa999999aa9a" + endpoint: "https://127.0.0.1" + skipCertificateValidation: true + mdm: "10.0.0.5,10.0.0.6" + zone: + name: "ZONE-2" + labelKey: "zone.csi-vxflexos.dellemc.com" ` dataWithoutZone := ` - username: "admin" @@ -243,7 +263,21 @@ func TestExtractZonesFromSecret(t *testing.T) { } client := fake.NewClientBuilder().WithObjects(secret).Build() - return client, map[string]string{"zone.csi-vxflexos.dellemc.com": "US-EAST"}, "vxflexos-config", false + return client, map[string]string{"2b11bb111111bb1b": "US-EAST"}, "vxflexos-config", false + }, + "success with zone and multi array": func() (client.WithWatch, map[string]string, string, bool) { + secret := &corev1.Secret{ + ObjectMeta: metav1.ObjectMeta{ + Name: "vxflexos-config", + Namespace: "vxflexos", + }, + Data: map[string][]byte{ + "config": []byte(zoneDataWithMultiArray), + }, + } + + client := fake.NewClientBuilder().WithObjects(secret).Build() + return client, map[string]string{"2b11bb111111bb1b": "ZONE-1", "1a99aa999999aa9a": "ZONE-2"}, "vxflexos-config", false }, "success no zone": func() (client.WithWatch, map[string]string, string, bool) { secret := &corev1.Secret{ From b734947fa55b05ff948ff2c4d1f75e760eeda137 Mon Sep 17 00:00:00 2001 From: ChristianAtDell <110482953+ChristianAtDell@users.noreply.github.com> Date: Tue, 10 Dec 2024 15:05:31 -0600 Subject: [PATCH 8/8] Zoning E2E Test + E2E Improvements (#818) --- tests/README.md | 26 +- tests/e2e/array-info.sh | 9 + tests/e2e/e2e_test.go | 2 +- tests/e2e/go.mod | 8 +- tests/e2e/go.sum | 8 + tests/e2e/modify_zoning_labels.sh | 197 ++++++++++++ tests/e2e/run-e2e-test.sh | 4 + tests/e2e/steps/step_common.go | 10 +- tests/e2e/steps/steps_def.go | 98 +++++- tests/e2e/steps/steps_runner.go | 4 +- .../minimal-testfiles/scenarios.yaml | 114 +++---- .../powerflex-zoning-secret-template.yaml | 20 ++ tests/e2e/testfiles/scenarios.yaml | 283 ++++++++++-------- 13 files changed, 573 insertions(+), 210 deletions(-) create mode 100755 tests/e2e/modify_zoning_labels.sh create mode 100644 tests/e2e/testfiles/powerflex-templates/powerflex-zoning-secret-template.yaml diff --git a/tests/README.md b/tests/README.md index c50522509..a1976e763 100644 --- a/tests/README.md +++ b/tests/README.md @@ -64,6 +64,8 @@ go get github.com/onsi/gomega/... For PowerFlex, Unity, PowerScale, PowerStore, Authorization, and Application-Mobility, system-specific information (array login credentials, system IDs, endpoints, etc.) need to be provided in e2e/array-info.sh so that all the required resources (secrets, storageclasses, etc.) can be created by the tests. Example values have been inserted; please replace these with values from your system. Refer to [CSM documentation](https://dell.github.io/csm-docs/docs/) for any further questions about driver or module pre-requisites. +In the case of end-to-end tests that involve PowerFlex zoning functionality, a second PowerFlex array will be necessary with its credentials provided in e2e/array-info.sh. + Please note that, if tests are stopped in the middle of a run, some files in `testfiles/*-templates` folders may remain in a partially modified state and break subsequent test runs. To undo these changes, you can run `git checkout --