remove csi tests from e2e suite

test/e2e/advanced/advanced_suite_test.go

@@ -9,14 +9,12 @@ import (
 	. "github.com/onsi/gomega"
 	"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
-	csiClient     csiclient.Interface
 	restConfig    *rest.Config
 	testNamespace string
 	ctx           context.Context
@@ -44,10 +42,6 @@ var _ = SynchronizedBeforeSuite(
 			"reloader.reloadStrategy": "annotations",
 			"reloader.watchGlobally":  "false",
 		}
-		if utils.IsCSIDriverInstalled(context.Background(), setupEnv.CSIClient) {
-			deployValues["reloader.enableCSIIntegration"] = "true"
-			GinkgoWriter.Println("Deploying Reloader with CSI integration support")
-		}
 
 		Expect(setupEnv.DeployAndWait(deployValues)).To(Succeed(), "Failed to deploy Reloader")
 
@@ -68,7 +62,6 @@ var _ = SynchronizedBeforeSuite(
 		Expect(err).NotTo(HaveOccurred(), "Failed to setup shared test environment")
 
 		kubeClient = testEnv.KubeClient
-		csiClient = testEnv.CSIClient
 		restConfig = testEnv.RestConfig
 		testNamespace = testEnv.Namespace
 		ctx = testEnv.Ctx

test/e2e/advanced/job_reload_test.go

@@ -1,9 +1,6 @@
 package advanced
 
 import (
-	"fmt"
-	"time"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -12,20 +9,16 @@ import (
 
 var _ = Describe("Job Workload Recreation Tests", func() {
 	var (
-		jobName         string
-		configMapName   string
-		secretName      string
-		spcName         string
-		vaultSecretPath string
-		jobAdapter      *utils.JobAdapter
+		jobName       string
+		configMapName string
+		secretName    string
+		jobAdapter    *utils.JobAdapter
 	)
 
 	BeforeEach(func() {
 		jobName = utils.RandName("job")
 		configMapName = utils.RandName("cm")
 		secretName = utils.RandName("secret")
-		spcName = utils.RandName("spc")
-		vaultSecretPath = fmt.Sprintf("secret/%s", utils.RandName("vault"))
 		jobAdapter = utils.NewJobAdapter(kubeClient)
 	})
 
@@ -33,8 +26,6 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 		_ = utils.DeleteJob(ctx, kubeClient, testNamespace, jobName)
 		_ = utils.DeleteConfigMap(ctx, kubeClient, testNamespace, configMapName)
 		_ = utils.DeleteSecret(ctx, kubeClient, testNamespace, secretName)
-		_ = utils.DeleteSecretProviderClass(ctx, csiClient, testNamespace, spcName)
-		_ = utils.DeleteVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath)
 	})
 
 	Context("Job with ConfigMap reference", func() {
@@ -181,68 +172,4 @@ var _ = Describe("Job Workload Recreation Tests", func() {
 			Expect(recreated).To(BeTrue(), "Job with valueFrom.secretKeyRef should be recreated when Secret changes")
 		})
 	})
-
-	Context("Job with SecretProviderClass reference", Label("csi"), func() {
-		BeforeEach(func() {
-			if !utils.IsCSIDriverInstalled(ctx, csiClient) {
-				Skip("CSI secrets store driver not installed - skipping CSI test")
-			}
-			if !utils.IsVaultProviderInstalled(ctx, kubeClient) {
-				Skip("Vault CSI provider not installed - skipping CSI test")
-			}
-		})
-
-		It("should recreate Job when Vault secret changes", func() {
-			By("Creating a secret in Vault")
-			err := utils.CreateVaultSecret(
-				ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "initial-value-v1"})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a SecretProviderClass pointing to Vault secret")
-			_, err = utils.CreateSecretProviderClassWithSecret(
-				ctx, csiClient, testNamespace, spcName,
-				vaultSecretPath, "api_key",
-			)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a Job with CSI volume and SPC reload annotation")
-			job, err := utils.CreateJob(ctx, kubeClient, testNamespace, jobName,
-				utils.WithJobCommand("sleep 300"),
-				utils.WithJobCSIVolume(spcName),
-				utils.WithJobAnnotations(utils.BuildSecretProviderClassReloadAnnotation(spcName)))
-			Expect(err).NotTo(HaveOccurred())
-			originalUID := string(job.UID)
-
-			By("Waiting for Job to be ready")
-			err = jobAdapter.WaitReady(ctx, testNamespace, jobName, utils.WorkloadReadyTimeout)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForSPC(
-				ctx, csiClient, testNamespace, spcName, utils.WorkloadReadyTimeout,
-			)
-			Expect(err).NotTo(HaveOccurred())
-			GinkgoWriter.Printf("Found SPCPS: %s\n", spcpsName)
-
-			By("Getting initial SPCPS version")
-			initialVersion, err := utils.GetSPCPSVersion(ctx, csiClient, testNamespace, spcpsName)
-			Expect(err).NotTo(HaveOccurred())
-			GinkgoWriter.Printf("Initial SPCPS version: %s\n", initialVersion)
-
-			By("Updating the Vault secret")
-			err = utils.UpdateVaultSecret(
-				ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{"api_key": "updated-value-v2"})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for CSI driver to sync the new secret version")
-			err = utils.WaitForSPCPSVersionChange(ctx, csiClient, testNamespace, spcpsName, initialVersion, 10*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-			GinkgoWriter.Println("CSI driver synced new secret version")
-
-			By("Waiting for Job to be recreated (new UID)")
-			_, recreated, err := jobAdapter.WaitRecreated(ctx, testNamespace, jobName, originalUID, utils.ReloadTimeout)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(recreated).To(BeTrue(), "Job should be recreated with new UID when Vault secret changes")
-		})
-	})
 })

test/e2e/advanced/multi_container_test.go

@@ -1,9 +1,6 @@
 package advanced
 
 import (
-	"fmt"
-	"time"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
@@ -95,125 +92,4 @@ var _ = Describe("Multi-Container Tests", Serial, func() {
 			Expect(reloaded).To(BeTrue(), "Deployment should be reloaded when first container's ConfigMap changes")
 		})
 	})
-
-	Context("Init container with CSI volume", Label("csi"), func() {
-		var (
-			spcName         string
-			vaultSecretPath string
-		)
-
-		BeforeEach(func() {
-			if !utils.IsCSIDriverInstalled(ctx, csiClient) {
-				Skip("CSI secrets store driver not installed")
-			}
-			if !utils.IsVaultProviderInstalled(ctx, kubeClient) {
-				Skip("Vault CSI provider not installed")
-			}
-			spcName = utils.RandName("spc")
-			vaultSecretPath = fmt.Sprintf("secret/%s", utils.RandName("test"))
-		})
-
-		AfterEach(func() {
-			if spcName != "" {
-				_ = utils.DeleteSecretProviderClass(ctx, csiClient, testNamespace, spcName)
-			}
-			if vaultSecretPath != "" {
-				_ = utils.DeleteVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath)
-			}
-		})
-
-		It("should reload when SecretProviderClassPodStatus used by init container changes", func() {
-			By("Creating a Vault secret")
-			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{
-				"api_key": "initial-init-value",
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a SecretProviderClass pointing to Vault")
-			_, err = utils.CreateSecretProviderClassWithSecret(ctx, csiClient, testNamespace, spcName, vaultSecretPath, "api_key")
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a Deployment with init container using CSI volume")
-			_, err = utils.CreateDeployment(ctx, kubeClient, testNamespace, deploymentName,
-				utils.WithInitContainerCSIVolume(spcName),
-				utils.WithAnnotations(utils.BuildSecretProviderClassReloadAnnotation(spcName)),
-			)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Getting initial SPCPS version")
-			initialVersion, err := utils.GetSPCPSVersion(ctx, csiClient, testNamespace, spcpsName)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Updating the Vault secret")
-			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{
-				"api_key": "updated-init-value",
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for CSI driver to sync (SPCPS version change)")
-			err = utils.WaitForSPCPSVersionChange(ctx, csiClient, testNamespace, spcpsName, initialVersion, 10*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for Deployment to be reloaded")
-			reloaded, err := adapter.WaitReloaded(ctx, testNamespace, deploymentName,
-				utils.AnnotationLastReloadedFrom, utils.ReloadTimeout)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(reloaded).To(BeTrue(), "Deployment with init container using CSI volume should be reloaded")
-		})
-
-		It("should reload with auto annotation when init container CSI volume changes", func() {
-			By("Creating a Vault secret")
-			err := utils.CreateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{
-				"api_key": "initial-init-auto-value",
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a SecretProviderClass pointing to Vault")
-			_, err = utils.CreateSecretProviderClassWithSecret(ctx, csiClient, testNamespace, spcName, vaultSecretPath, "api_key")
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Creating a Deployment with init container using CSI volume and auto annotation")
-			_, err = utils.CreateDeployment(ctx, kubeClient, testNamespace, deploymentName,
-				utils.WithInitContainerCSIVolume(spcName),
-				utils.WithAnnotations(utils.BuildAutoTrueAnnotation()),
-			)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for Deployment to be ready")
-			err = adapter.WaitReady(ctx, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Finding the SPCPS created by CSI driver")
-			spcpsName, err := utils.FindSPCPSForDeployment(ctx, csiClient, kubeClient, testNamespace, deploymentName, utils.WorkloadReadyTimeout)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Getting initial SPCPS version")
-			initialVersion, err := utils.GetSPCPSVersion(ctx, csiClient, testNamespace, spcpsName)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Updating the Vault secret")
-			err = utils.UpdateVaultSecret(ctx, kubeClient, restConfig, vaultSecretPath, map[string]string{
-				"api_key": "updated-init-auto-value",
-			})
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for CSI driver to sync (SPCPS version change)")
-			err = utils.WaitForSPCPSVersionChange(ctx, csiClient, testNamespace, spcpsName, initialVersion, 10*time.Second)
-			Expect(err).NotTo(HaveOccurred())
-
-			By("Waiting for Deployment to be reloaded")
-			reloaded, err := adapter.WaitReloaded(ctx, testNamespace, deploymentName,
-				utils.AnnotationLastReloadedFrom, utils.ReloadTimeout)
-			Expect(err).NotTo(HaveOccurred())
-			Expect(reloaded).To(BeTrue(), "Deployment with init container CSI volume and auto=true should be reloaded")
-		})
-	})
 })