Add CreateYAMLFromFileWithEnvvars method to ApplyClient for environment variable substitution

- Implemented CreateYAMLFromFileWithEnvvars to read a YAML file, validate environment variables, and create resources.
- Added FindUnsetEnvVars function to identify unset environment variables in the YAML content.
- Updated stress tests to validate environment variables in custom resource files before applying them.
- Adjusted cluster_config.yml to specify Kubernetes version and added new CSI modules with dependencies.

Author: mrwesadex-flant

pkg/kubernetes/apply.go

@@ -19,6 +19,8 @@ package kubernetes
 import (
 	"context"
 	"fmt"
+	"os"
+	"regexp"
 	"strings"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -223,6 +225,57 @@ func (c *ApplyClient) createDocument(ctx context.Context, yamlDoc string, defaul
 	return nil
 }
 
+// CreateYAMLFromFileWithEnvvars reads a YAML file, validates environment variables, substitutes them, and creates resources
+// Returns error if file cannot be read, any ${VAR} is not set, or resource creation fails
+func (c *ApplyClient) CreateYAMLFromFileWithEnvvars(ctx context.Context, filePath string, namespace string) error {
+	// Read file content
+	content, err := os.ReadFile(filePath)
+	if err != nil {
+		return fmt.Errorf("failed to read file %s: %w", filePath, err)
+	}
+
+	yamlContent := string(content)
+
+	// Find all ${VAR} patterns and check if they're set
+	unsetVars := FindUnsetEnvVars(yamlContent)
+	if len(unsetVars) > 0 {
+		return fmt.Errorf("environment variables not set: %v", unsetVars)
+	}
+
+	// Substitute environment variables
+	expanded := os.ExpandEnv(yamlContent)
+
+	// Create resources
+	return c.CreateYAML(ctx, expanded, namespace)
+}
+
+// FindUnsetEnvVars finds all ${VAR} patterns in content and returns those that are not set
+func FindUnsetEnvVars(content string) []string {
+	// Match ${VAR} pattern
+	re := regexp.MustCompile(`\$\{([A-Za-z_][A-Za-z0-9_]*)\}`)
+	matches := re.FindAllStringSubmatch(content, -1)
+
+	seen := make(map[string]bool)
+	var unset []string
+
+	for _, match := range matches {
+		if len(match) < 2 {
+			continue
+		}
+		varName := match[1]
+		if seen[varName] {
+			continue
+		}
+		seen[varName] = true
+
+		if os.Getenv(varName) == "" {
+			unset = append(unset, varName)
+		}
+	}
+
+	return unset
+}
+
 // splitYAMLDocuments splits YAML content by "---" separator
 func splitYAMLDocuments(yamlContent string) []string {
 	// Split by document separator

tests/csi-all-stress-tests/cluster_config.yml

@@ -39,7 +39,7 @@ clusterDefinition:
       diskSize: 30
   # DKP parameters
   dkpParameters:
-    kubernetesVersion: "Automatic"
+    kubernetesVersion: "1.35"
     podSubnetCIDR: "10.112.0.0/16"
     serviceSubnetCIDR: "10.225.0.0/16"
     clusterDomain: "cluster.local"
@@ -63,4 +63,21 @@ clusterDefinition:
         settings:
           enableThinProvisioning: true
         dependencies: []
+      - name: "csi-huawei"
+        version: 1
+        enabled: true
+        modulePullOverride: "mr48"
+        dependencies:
+          - "snapshot-controller"
+      - name: "csi-hpe"
+        version: 1
+        enabled: true
+        dependencies:
+          - "snapshot-controller"
+      - name: "csi-netapp"
+        version: 1
+        enabled: true
+        dependencies:
+          - "snapshot-controller"
+
 

tests/csi-all-stress-tests/csi_all_stress_tests_test.go

@@ -21,6 +21,7 @@ import (
 	"os"
 	"path/filepath"
 	"runtime"
+	"strings"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -35,9 +36,48 @@ import (
 var _ = Describe("All CSIs Stress Tests", Ordered, func() {
 	var (
 		testClusterResources *cluster.TestClusterResources
+		testDir              string
+		crFiles              []string
+		crFilesDir           string
+		storageClassNames    []string
 	)
 
 	BeforeAll(func() {
+		By("Setting up test variables", func() {
+			_, callerFile, _, ok := runtime.Caller(0)
+			Expect(ok).To(BeTrue(), "Failed to determine test file path")
+			testDir = filepath.Dir(callerFile)
+
+			crFiles = []string{"csi-huawei-cr.yml", "csi-hpe-cr.yml", "csi-netapp-cr.yml"}
+			crFilesDir = filepath.Join(testDir, "files")
+
+			storageClassNames = []string{"hsclass-200", "hpe-iscsi", "csi-netapp-sc1"}
+		})
+
+		By("Validating environment variables in CR files", func() {
+			var allUnsetVars []string
+
+			for _, fileName := range crFiles {
+				filePath := filepath.Join(crFilesDir, fileName)
+
+				// Skip if file doesn't exist
+				if _, err := os.Stat(filePath); os.IsNotExist(err) {
+					continue
+				}
+
+				content, err := os.ReadFile(filePath)
+				Expect(err).NotTo(HaveOccurred(), "Failed to read file: "+fileName)
+
+				unsetVars := kubernetes.FindUnsetEnvVars(string(content))
+				if len(unsetVars) > 0 {
+					GinkgoWriter.Printf("    ❌ %s requires env vars: %v\n", fileName, unsetVars)
+					allUnsetVars = append(allUnsetVars, unsetVars...)
+				}
+			}
+
+			Expect(allUnsetVars).To(BeEmpty(), "Environment variables for custom resources are not set: "+strings.Join(allUnsetVars, ", "))
+		})
+
 		By("Outputting environment variables", func() {
 			GinkgoWriter.Printf("    📋 Environment variables (without default values):\n")
 
@@ -154,12 +194,6 @@ var _ = Describe("All CSIs Stress Tests", Ordered, func() {
 	It("should create NGCs", func() {
 		ctx := context.Background()
 
-		// Resolve file path relative to test directory (same approach as CreateTestCluster)
-		// runtime.Caller(0) gets this test file's location
-		_, callerFile, _, ok := runtime.Caller(0)
-		Expect(ok).To(BeTrue(), "Failed to determine test file path")
-		testDir := filepath.Dir(callerFile)
-
 		yamlFilePathNGCs := filepath.Join(testDir, "files", "ngc.yml")
 
 		By("Applying NGCs", func() {
@@ -180,48 +214,31 @@ var _ = Describe("All CSIs Stress Tests", Ordered, func() {
 
 	It("should create modules' custom resources", func() {
 		ctx := context.Background()
-		crFiles := []string{"csi-huawei-cr.yml", "csi-hpe-cr.yml", "csi-netapp-cr.yml"}
-
-		// Resolve file path relative to test directory
-		_, callerFile, _, ok := runtime.Caller(0)
-		Expect(ok).To(BeTrue(), "Failed to determine test file path")
-		testDir := filepath.Dir(callerFile)
-		filesDir := filepath.Join(testDir, "files")
 
 		By("Applying all storage custom resources", func() {
 			GinkgoWriter.Printf("    ▶️ Creating storage resources from %d files...\n", len(crFiles))
 
-			var combinedContent string
+			applyClient, err := kubernetes.NewApplyClient(testClusterResources.Kubeconfig)
+			Expect(err).NotTo(HaveOccurred(), "Failed to create apply client")
+
 			for _, fileName := range crFiles {
-				filePath := filepath.Join(filesDir, fileName)
+				filePath := filepath.Join(crFilesDir, fileName)
 
 				// Skip if file doesn't exist
 				if _, err := os.Stat(filePath); os.IsNotExist(err) {
 					GinkgoWriter.Printf("    ⏭️  Skipping %s (file not found)\n", fileName)
 					continue
 				}
 
-				content, err := os.ReadFile(filePath)
-				Expect(err).NotTo(HaveOccurred(), "Failed to read file: "+fileName)
-
-				// Add document separator if not first file
-				if combinedContent != "" {
-					combinedContent += "\n---\n"
-				}
-				combinedContent += string(content)
+				GinkgoWriter.Printf("    📄 Applying %s...\n", fileName)
+				err = applyClient.CreateYAMLFromFileWithEnvvars(ctx, filePath, "")
+				Expect(err).NotTo(HaveOccurred(), "Failed to apply "+fileName)
 			}
 
-			applyClient, err := kubernetes.NewApplyClient(testClusterResources.Kubeconfig)
-			Expect(err).NotTo(HaveOccurred(), "Failed to create apply client")
-
-			err = applyClient.CreateYAML(ctx, combinedContent, "")
-			Expect(err).NotTo(HaveOccurred(), "Failed to apply YAML resources")
-
 			GinkgoWriter.Printf("    ✅ Resources created successfully\n")
 		})
 
 		By("Waiting for StorageClasses to become available", func() {
-			storageClassNames := []string{"hsclass-200", "hpe", "netapp"}
 
 			GinkgoWriter.Printf("    ▶️ Waiting for %d StorageClasses...\n", len(storageClassNames))
 

tests/csi-all-stress-tests/files/csi-hpe-cr.yml

@@ -0,0 +1,24 @@
+---
+apiVersion: storage.deckhouse.io/v1alpha1
+kind: HPEStorageConnection
+metadata:
+  name: hpe
+spec:
+  controlPlane:
+    backendAddress: 172.17.1.55
+    password: '${HPE_PASSWORD}'
+    serviceName: primera3par-csp-svc
+    servicePort: "8080"
+    username: 3paradm
+---
+apiVersion: storage.deckhouse.io/v1alpha1
+kind: HPEStorageClass
+metadata:
+  name: hpe-iscsi
+spec:
+  accessProtocol: iscsi
+  cpg: test-cpg
+  fsType: xfs
+  pool: test-cpg
+  reclaimPolicy: Delete
+  storageConnectionName: hpe

tests/csi-all-stress-tests/files/csi-netapp-cr.yml

@@ -0,0 +1,33 @@
+---
+apiVersion: storage.deckhouse.io/v1alpha1
+kind: NetappStorageConnection
+metadata:
+  name: csi-netapp-conn1
+spec:
+  controlPlane:
+    address: 172.17.1.82
+    password: '${NETAPP_PASSWORD}'
+    protocol: ontapi
+    svm: svm0
+    username: admin
+  dataPlane:
+    iSCSI:
+      chap:
+        chapInitiatorSecret: '${NETAPP_CHAP_INITIATOR_SECRET}'
+        chapTargetInitiatorSecret: '${NETAPP_CHAP_TARGET_INITIATOR_SECRET}'
+        chapTargetUsername: target@dm|n
+        chapUsername: chap@dm1n
+        useChap: false
+    nfs:
+      address: 10.200.0.80
+      version: "3"
+    protocol: iscsi
+---
+apiVersion: storage.deckhouse.io/v1alpha1
+kind: NetappStorageClass
+metadata:
+  name: csi-netapp-sc1
+spec:
+  connectionName: csi-netapp-conn1
+  fsType: ext4
+  provisioningType: thin