Ensure that the fields mentioned in samples are configurable.

operatorconfig/driverconfig/powerstore/v2.5.0/controller.yaml

@@ -107,13 +107,13 @@ spec:
       affinity:
         podAntiAffinity:
           requiredDuringSchedulingIgnoredDuringExecution:
-            - labelSelector:
+          - labelSelector:
               matchExpressions:
-                - key: "name"
+                - key: name
                   operator: In
                   values:
-                    - <DriverDefaultReleaseName>-controller
-              topologyKey: "kubernetes.io/hostname"
+                  - <DriverDefaultReleaseName>-controller
+            topologyKey: kubernetes.io/hostname 
       containers:
         - name: attacher
           image: k8s.gcr.io/sig-storage/csi-attacher:v4.0.0
@@ -226,7 +226,7 @@ spec:
             - name: X_CSI_POWERSTORE_EXTERNAL_ACCESS
               value: "None"
             - name: X_CSI_NFS_ACLS
-              value: "0777"
+              value: "<X_CSI_NFS_ACLS>"
             - name: X_CSI_POWERSTORE_CONFIG_PATH
               value: /powerstore-config/config
             - name: X_CSI_POWERSTORE_CONFIG_PARAMS_PATH
@@ -238,7 +238,7 @@ spec:
             - name: X_CSI_PODMON_API_PORT
               value: 8083
             - name: X_CSI_HEALTH_MONITOR_ENABLED
-              value: "false"
+              value: "<X_CSI_HEALTH_MONITOR_ENABLED>"
           volumeMounts:
             - name: socket-dir
               mountPath: /var/run/csi

operatorconfig/driverconfig/powerstore/v2.5.0/node.yaml

@@ -94,26 +94,35 @@ spec:
                   apiVersion: v1
                   fieldPath: spec.nodeName
             - name: X_CSI_POWERSTORE_NODE_NAME_PREFIX
-              value: csi-node
+              value: <X_CSI_POWERSTORE_NODE_NAME_PREFIX>
             - name: X_CSI_POWERSTORE_NODE_ID_PATH
               value: /node-id
             - name: X_CSI_POWERSTORE_NODE_CHROOT_PATH
               value: /noderoot
             - name: X_CSI_POWERSTORE_TMP_DIR
-              value: var/lib/kubelet/plugins/csi-powerstore.dellemc.com/tmp
+              value: /var/lib/kubelet/plugins/csi-powerstore.dellemc.com/tmp
             - name: X_CSI_DRIVER_NAME
-              value: "csi-powerstore"
+              value: "csi-powerstore.dellemc.com"
             - name: X_CSI_FC_PORTS_FILTER_FILE_PATH
-              value: /etc/fc-ports-filter
+              value: <X_CSI_FC_PORTS_FILTER_FILE_PATH>
             - name: X_CSI_POWERSTORE_ENABLE_CHAP
-              value: "false"
+              value: "<X_CSI_POWERSTORE_ENABLE_CHAP>"
             - name: X_CSI_POWERSTORE_CONFIG_PATH
               value: /powerstore-config/config
             - name: X_CSI_POWERSTORE_CONFIG_PARAMS_PATH
               value: /powerstore-config-params/driver-config-params.yaml
             - name: GOPOWERSTORE_DEBUG
               value: "true"
             - name: X_CSI_HEALTH_MONITOR_ENABLED
+              value: "<X_CSI_HEALTH_MONITOR_ENABLED>"
+          volumeMounts:
+            - name: driver-path
+              mountPath: /var/lib/kubelet/plugins/csi-powerstore.dellemc.com
+            - name: csi-path
+              mountPath: /var/lib/kubelet/plugins/kubernetes.io/csi
+              mountPropagation: "Bidirectional"
+            - name: pods-path
+              mountPath: /var/lib/kubelet/pods
               value: "false"
           volumeMounts:
             - name: driver-path
@@ -148,7 +157,7 @@ spec:
           args:
             - "--v=5"
             - "--csi-address=$(ADDRESS)"
-            - --kubelet-registration-path=var/lib/kubelet/plugins/csi-powerstore.dellemc.com/csi_sock
+            - --kubelet-registration-path=/var/lib/kubelet/plugins/csi-powerstore.dellemc.com/csi_sock
           env:
             - name: ADDRESS
               value: /csi/csi_sock

pkg/drivers/commonconfig.go

@@ -45,6 +45,9 @@ func GetController(ctx context.Context, cr csmv1.ContainerStorageModule, operato
 	}
 
 	YamlString := utils.ModifyCommonCR(string(buf), cr)
+	if cr.Spec.Driver.CSIDriverType == "powerstore" {
+		YamlString = ModifyPowerstoreCR(YamlString, cr, "Controller")
+	}
 
 	driverYAML, err := utils.GetDriverYaml(YamlString, "Deployment")
 	if err != nil {
@@ -158,6 +161,9 @@ func GetNode(ctx context.Context, cr csmv1.ContainerStorageModule, operatorConfi
 	}
 
 	YamlString := utils.ModifyCommonCR(string(buf), cr)
+	if cr.Spec.Driver.CSIDriverType == "powerstore" {
+		YamlString = ModifyPowerstoreCR(YamlString, cr, "Node")
+	}
 
 	driverYAML, err := utils.GetDriverYaml(YamlString, "DaemonSet")
 	if err != nil {

pkg/drivers/powerstore.go

@@ -15,10 +15,15 @@ package drivers
 import (
 	"context"
 	"fmt"
+	"os"
+	"strings"
+
 	csmv1 "github.com/dell/csm-operator/api/v1"
 	"github.com/dell/csm-operator/pkg/logger"
 	"github.com/dell/csm-operator/pkg/utils"
-	"os"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/errors"
+	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -28,6 +33,21 @@ const (
 
 	// PowerStoreConfigParamsVolumeMount -
 	PowerStoreConfigParamsVolumeMount = "csi-powerstore-config-params"
+
+	// CsiPowerstoreNodeNamePrefix - Node Name Prefix
+	CsiPowerstoreNodeNamePrefix = "<X_CSI_POWERSTORE_NODE_NAME_PREFIX>"
+
+	// CsiFcPortFilterFilePath - Fc Port Filter File Path
+	CsiFcPortFilterFilePath = "<X_CSI_FC_PORTS_FILTER_FILE_PATH>"
+
+	// CsiNfsAcls - variable setting the permissions on NFS mount directory
+	CsiNfsAcls = "<X_CSI_NFS_ACLS>"
+
+	// CsiHealthMonitorEnabled - health monitor flag
+	CsiHealthMonitorEnabled = "<X_CSI_HEALTH_MONITOR_ENABLED>"
+
+	// CsiPowerstoreEnableChap -  CHAP flag
+	CsiPowerstoreEnableChap = "<X_CSI_POWERSTORE_ENABLE_CHAP>"
 )
 
 // PrecheckPowerStore do input validation
@@ -44,6 +64,64 @@ func PrecheckPowerStore(ctx context.Context, cr *csmv1.ContainerStorageModule, o
 	}
 	secrets := []string{config}
 
+	for _, name := range secrets {
+		found := &corev1.Secret{}
+		err := ct.Get(ctx, types.NamespacedName{Name: name, Namespace: cr.GetNamespace()}, found)
+		if err != nil {
+			log.Error(err, "Failed query for secret ", name)
+			if errors.IsNotFound(err) {
+				return fmt.Errorf("failed to find secret %s", name)
+			}
+		}
+	}
+
 	log.Debugw("preCheck", "secrets", len(secrets))
 	return nil
 }
+
+// ModifyPowerstoreCR -
+func ModifyPowerstoreCR(yamlString string, cr csmv1.ContainerStorageModule, fileType string) string {
+	// Parameters to initialise CR values
+	nodePrefix := ""
+	fcPortFilter := ""
+	nfsAcls := ""
+	healthMonitorController := ""
+	chap := ""
+	healthMonitorNode := ""
+
+	switch fileType {
+	case "Node":
+		for _, env := range cr.Spec.Driver.Common.Envs {
+			if env.Name == "X_CSI_POWERSTORE_NODE_NAME_PREFIX" {
+				nodePrefix = env.Value
+			}
+			if env.Name == "X_CSI_FC_PORTS_FILTER_FILE_PATH" {
+				fcPortFilter = env.Value
+			}
+		}
+		for _, env := range cr.Spec.Driver.Node.Envs {
+			if env.Name == "X_CSI_POWERSTORE_ENABLE_CHAP" {
+				chap = env.Value
+			}
+			if env.Name == "X_CSI_HEALTH_MONITOR_ENABLED" {
+				healthMonitorNode = env.Value
+			}
+		}
+		yamlString = strings.ReplaceAll(yamlString, CsiPowerstoreNodeNamePrefix, nodePrefix)
+		yamlString = strings.ReplaceAll(yamlString, CsiFcPortFilterFilePath, fcPortFilter)
+		yamlString = strings.ReplaceAll(yamlString, CsiPowerstoreEnableChap, chap)
+		yamlString = strings.ReplaceAll(yamlString, CsiHealthMonitorEnabled, healthMonitorNode)
+	case "Controller":
+		for _, env := range cr.Spec.Driver.Controller.Envs {
+			if env.Name == "X_CSI_NFS_ACLS" {
+				nfsAcls = env.Value
+			}
+			if env.Name == "X_CSI_HEALTH_MONITOR_ENABLED" {
+				healthMonitorController = env.Value
+			}
+		}
+		yamlString = strings.ReplaceAll(yamlString, CsiNfsAcls, nfsAcls)
+		yamlString = strings.ReplaceAll(yamlString, CsiHealthMonitorEnabled, healthMonitorController)
+	}
+	return yamlString
+}

samples/storage_csm_powerstore_v250.yaml

@@ -13,6 +13,7 @@ spec:
       fSGroupPolicy: "ReadWriteOnceWithFSType"
     # Config version for CSI PowerStore v2.5.0 driver
     configVersion: v2.5.0
+    authSecret: test-powerstore-config
     # Controller count
     replicas: 2
     dnsPolicy: ClusterFirstWithHostNet
@@ -115,13 +116,3 @@ spec:
       # - key: "node-role.kubernetes.io/control-plane"
       #   operator: "Exists"
       #   effect: "NoSchedule"
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: test-powerstore-config-params
-  namespace: test-powerstore
-data:
-  driver-config-params.yaml: |
-    CSI_LOG_LEVEL: "debug"
-    CSI_LOG_FORMAT: "JSON"