feat: A lot of refactoring and CSI test cases

test/e2e/core/core_suite_test.go

@@ -6,15 +6,17 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/stakater/Reloader/test/e2e/utils"
-	"k8s.io/client-go/dynamic"
 	"k8s.io/client-go/kubernetes"
-)
+	"k8s.io/client-go/rest"
+	csiclient "sigs.k8s.io/secrets-store-csi-driver/pkg/client/clientset/versioned"
 
+	"github.com/stakater/Reloader/test/e2e/utils"
+)
 
 var (
 	kubeClient    kubernetes.Interface
-	dynamicClient dynamic.Interface
+	csiClient     csiclient.Interface
+	restConfig    *rest.Config
 	testNamespace string
 	ctx           context.Context
 	cancel        context.CancelFunc
@@ -31,46 +33,45 @@ var _ = BeforeSuite(func() {
 	var err error
 	ctx, cancel = context.WithCancel(context.Background())
 
-	// Setup test environment
 	testEnv, err = utils.SetupTestEnvironment(ctx, "reloader-core-test")
 	Expect(err).NotTo(HaveOccurred(), "Failed to setup test environment")
 
-	// Export for use in tests
 	kubeClient = testEnv.KubeClient
-	dynamicClient = testEnv.DynamicClient
+	csiClient = testEnv.CSIClient
+	restConfig = testEnv.RestConfig
 	testNamespace = testEnv.Namespace
 
-	// Create adapter registry
-	registry = utils.NewAdapterRegistry(kubeClient, dynamicClient)
+	registry = utils.NewAdapterRegistry(kubeClient)
 
-	// Register ArgoRolloutAdapter if Argo Rollouts is installed
-	if utils.IsArgoRolloutsInstalled(ctx, dynamicClient) {
+	if utils.IsArgoRolloutsInstalled(ctx, testEnv.RolloutsClient) {
 		GinkgoWriter.Println("Argo Rollouts detected, registering ArgoRolloutAdapter")
-		registry.RegisterAdapter(utils.NewArgoRolloutAdapter(dynamicClient))
+		registry.RegisterAdapter(utils.NewArgoRolloutAdapter(testEnv.RolloutsClient))
 	} else {
 		GinkgoWriter.Println("Argo Rollouts not detected, skipping ArgoRolloutAdapter registration")
 	}
 
-	// Register DeploymentConfigAdapter if OpenShift is available
-	if utils.HasDeploymentConfigSupport(testEnv.DiscoveryClient) {
+	if utils.HasDeploymentConfigSupport(testEnv.DiscoveryClient) && testEnv.OpenShiftClient != nil {
 		GinkgoWriter.Println("OpenShift detected, registering DeploymentConfigAdapter")
-		registry.RegisterAdapter(utils.NewDeploymentConfigAdapter(dynamicClient))
+		registry.RegisterAdapter(utils.NewDeploymentConfigAdapter(testEnv.OpenShiftClient))
 	} else {
 		GinkgoWriter.Println("OpenShift not detected, skipping DeploymentConfigAdapter registration")
 	}
 
-	// Deploy Reloader with default annotations strategy
-	// Individual test contexts will redeploy with different strategies if needed
 	deployValues := map[string]string{
 		"reloader.reloadStrategy": "annotations",
+		"reloader.watchGlobally":  "false", // Only watch own namespace to prevent cross-talk between test suites
 	}
 
-	// Enable Argo Rollouts support if Argo is installed
-	if utils.IsArgoRolloutsInstalled(ctx, dynamicClient) {
+	if utils.IsArgoRolloutsInstalled(ctx, testEnv.RolloutsClient) {
 		deployValues["reloader.isArgoRollouts"] = "true"
 		GinkgoWriter.Println("Deploying Reloader with Argo Rollouts support")
 	}
 
+	if utils.IsCSIDriverInstalled(ctx, csiClient) {
+		deployValues["reloader.enableCSIIntegration"] = "true"
+		GinkgoWriter.Println("Deploying Reloader with CSI integration support")
+	}
+
 	err = testEnv.DeployAndWait(deployValues)
 	Expect(err).NotTo(HaveOccurred(), "Failed to deploy Reloader")
 })

test/e2e/core/reference_methods_test.go

@@ -5,6 +5,7 @@ import (
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+
 	"github.com/stakater/Reloader/test/e2e/utils"
 )
 
@@ -33,7 +34,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when ConfigMap referenced via valueFrom.configMapKeyRef changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -46,7 +49,7 @@ var _ = Describe("Reference Method Tests", func() {
 					UseConfigMapKeyRef: true,
 					ConfigMapKey:       "config_key",
 					EnvVarName:         "MY_CONFIG_VAR",
-					Annotations: utils.BuildConfigMapReloadAnnotation(configMapName),
+					Annotations:        utils.BuildConfigMapReloadAnnotation(configMapName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -81,7 +84,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when Secret referenced via valueFrom.secretKeyRef changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a Secret")
 				_, err := utils.CreateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
@@ -90,11 +95,11 @@ var _ = Describe("Reference Method Tests", func() {
 
 				By("Creating workload with valueFrom.secretKeyRef")
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
-					SecretName:    secretName,
+					SecretName:      secretName,
 					UseSecretKeyRef: true,
-					SecretKey:     "secret_key",
-					EnvVarName:    "MY_SECRET_VAR",
-					Annotations: utils.BuildSecretReloadAnnotation(secretName),
+					SecretKey:       "secret_key",
+					EnvVarName:      "MY_SECRET_VAR",
+					Annotations:     utils.BuildSecretReloadAnnotation(secretName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -129,7 +134,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when ConfigMap in projected volume changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -140,7 +147,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					ConfigMapName:      configMapName,
 					UseProjectedVolume: true,
-					Annotations: utils.BuildConfigMapReloadAnnotation(configMapName),
+					Annotations:        utils.BuildConfigMapReloadAnnotation(configMapName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -170,7 +177,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when Secret in projected volume changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a Secret")
 				_, err := utils.CreateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
@@ -181,7 +190,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					SecretName:         secretName,
 					UseProjectedVolume: true,
-					Annotations: utils.BuildSecretReloadAnnotation(secretName),
+					Annotations:        utils.BuildSecretReloadAnnotation(secretName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -211,7 +220,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when ConfigMap changes in mixed projected volume",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap and Secret")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -260,7 +271,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when Secret changes in mixed projected volume",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap and Secret")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -314,7 +327,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when ConfigMap referenced by init container changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -325,7 +340,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					ConfigMapName:    configMapName,
 					UseInitContainer: true,
-					Annotations: utils.BuildConfigMapReloadAnnotation(configMapName),
+					Annotations:      utils.BuildConfigMapReloadAnnotation(configMapName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -355,7 +370,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when Secret referenced by init container changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a Secret")
 				_, err := utils.CreateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
@@ -366,7 +383,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					SecretName:       secretName,
 					UseInitContainer: true,
-					Annotations: utils.BuildSecretReloadAnnotation(secretName),
+					Annotations:      utils.BuildSecretReloadAnnotation(secretName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -398,7 +415,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when ConfigMap volume mounted in init container changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -409,7 +428,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					ConfigMapName:          configMapName,
 					UseInitContainerVolume: true,
-					Annotations: utils.BuildConfigMapReloadAnnotation(configMapName),
+					Annotations:            utils.BuildConfigMapReloadAnnotation(configMapName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -439,7 +458,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload when Secret volume mounted in init container changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a Secret")
 				_, err := utils.CreateSecretFromStrings(ctx, kubeClient, testNamespace, secretName,
@@ -450,7 +471,7 @@ var _ = Describe("Reference Method Tests", func() {
 				err = adapter.Create(ctx, testNamespace, workloadName, utils.WorkloadConfig{
 					SecretName:             secretName,
 					UseInitContainerVolume: true,
-					Annotations: utils.BuildSecretReloadAnnotation(secretName),
+					Annotations:            utils.BuildSecretReloadAnnotation(secretName),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })
@@ -485,7 +506,9 @@ var _ = Describe("Reference Method Tests", func() {
 		DescribeTable("should reload with auto=true when ConfigMap referenced via valueFrom changes",
 			func(workloadType utils.WorkloadType) {
 				adapter := registry.Get(workloadType)
-				if adapter == nil { Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType)) }
+				if adapter == nil {
+					Skip(fmt.Sprintf("%s adapter not available (CRD not installed)", workloadType))
+				}
 
 				By("Creating a ConfigMap")
 				_, err := utils.CreateConfigMap(ctx, kubeClient, testNamespace, configMapName,
@@ -498,7 +521,7 @@ var _ = Describe("Reference Method Tests", func() {
 					UseConfigMapKeyRef: true,
 					ConfigMapKey:       "auto_config_key",
 					EnvVarName:         "AUTO_CONFIG_VAR",
-					Annotations: utils.BuildAutoTrueAnnotation(),
+					Annotations:        utils.BuildAutoTrueAnnotation(),
 				})
 				Expect(err).NotTo(HaveOccurred())
 				DeferCleanup(func() { _ = adapter.Delete(ctx, testNamespace, workloadName) })