Revert "enum for stateful set test yaml"

This reverts commit b1518f3.

Author: Wei Weng

test/e2e/enveloped_object_placement_test.go

@@ -226,7 +226,7 @@ var _ = Describe("placing wrapped resources using a CRP", func() {
 			// read the test resources.
 			readDeploymentTestManifest(&testDeployment)
 			readDaemonSetTestManifest(&testDaemonSet)
-			readStatefulSetTestManifest(&testStatefulSet, StatefulSetWithStorage)
+			readStatefulSetTestManifest(&testStatefulSet, true)
 			readEnvelopeResourceTestManifest(&testResourceEnvelope)
 		})
 

test/e2e/resource_placement_hub_workload_test.go

@@ -39,7 +39,7 @@ var _ = Describe("placing workloads using a CRP with PickAll policy", Label("res
 		// Read the test manifests
 		readDeploymentTestManifest(&testDeployment)
 		readDaemonSetTestManifest(&testDaemonSet)
-		readStatefulSetTestManifest(&testStatefulSet, StatefulSetWithStorage)
+		readStatefulSetTestManifest(&testStatefulSet, false)
 		workNamespace := appNamespace()
 
 		// Create namespace and workloads

test/e2e/resource_placement_rollout_test.go

@@ -69,7 +69,7 @@ var _ = Describe("placing namespaced scoped resources using a RP with rollout",
 		testDaemonSet = appv1.DaemonSet{}
 		readDaemonSetTestManifest(&testDaemonSet)
 		testStatefulSet = appv1.StatefulSet{}
-		readStatefulSetTestManifest(&testStatefulSet, StatefulSetBasic)
+		readStatefulSetTestManifest(&testStatefulSet, false)
 		testService = corev1.Service{}
 		readServiceTestManifest(&testService)
 		testJob = batchv1.Job{}

test/e2e/resources/statefulset-with-storage.yaml

@@ -342,7 +342,7 @@ var _ = Describe("placing wrapped resources using a CRP", Ordered, func() {
 
 		BeforeAll(func() {
 			// Create the test resources.
-			readStatefulSetTestManifest(&testStatefulSet, StatefulSetBasic)
+			readStatefulSetTestManifest(&testStatefulSet, false)
 			readEnvelopeResourceTestManifest(&testStatefulSetEnvelope)
 			wantSelectedResources = []placementv1beta1.ResourceIdentifier{
 				{

…sources/statefulset-invalid-storage.yaml …e/resources/statefulset-with-volume.yamltest/e2e/resources/statefulset-invalid-storage.yaml renamed to test/e2e/resources/statefulset-with-volume.yaml test/e2e/resources/statefulset-invalid-storage.yaml renamed to test/e2e/resources/statefulset-with-volume.yaml

@@ -57,18 +57,6 @@ import (
 	"github.com/kubefleet-dev/kubefleet/test/e2e/framework"
 )
 
-// StatefulSetVariant represents different StatefulSet configurations for testing
-type StatefulSetVariant int
-
-const (
-	// StatefulSetBasic is a StatefulSet without any persistent volume claims
-	StatefulSetBasic StatefulSetVariant = iota
-	// StatefulSetInvalidStorage is a StatefulSet with a non-existent storage class
-	StatefulSetInvalidStorage
-	// StatefulSetWithStorage is a StatefulSet with a valid standard storage class
-	StatefulSetWithStorage
-)
-
 var (
 	croTestAnnotationKey    = "cro-test-annotation"
 	croTestAnnotationValue  = "cro-test-annotation-val"
@@ -1544,18 +1532,13 @@ func readDaemonSetTestManifest(testDaemonSet *appsv1.DaemonSet) {
 	Expect(err).Should(Succeed())
 }
 
-func readStatefulSetTestManifest(testStatefulSet *appsv1.StatefulSet, variant StatefulSetVariant) {
+func readStatefulSetTestManifest(testStatefulSet *appsv1.StatefulSet, withVolume bool) {
 	By("Read the statefulSet resource")
-	var manifestPath string
-	switch variant {
-	case StatefulSetBasic:
-		manifestPath = "resources/statefulset-basic.yaml"
-	case StatefulSetInvalidStorage:
-		manifestPath = "resources/statefulset-invalid-storage.yaml"
-	case StatefulSetWithStorage:
-		manifestPath = "resources/statefulset-with-storage.yaml"
-	}
-	Expect(utils.GetObjectFromManifest(manifestPath, testStatefulSet)).Should(Succeed())
+	if withVolume {
+		Expect(utils.GetObjectFromManifest("resources/statefulset-with-volume.yaml", testStatefulSet)).Should(Succeed())
+	} else {
+		Expect(utils.GetObjectFromManifest("resources/test-statefulset.yaml", testStatefulSet)).Should(Succeed())
+	}
 }
 
 func readServiceTestManifest(testService *corev1.Service) {