fix: try to fix failure

ntkathole · ntkathole · commit 8a84afcb1707 · 2025-12-13T15:23:43.000+05:30
Signed-off-by: ntkathole &lt;nikhilkathole2683@gmail.com&gt;
diff --git a/infra/feast-operator/test/utils/test_util.go b/infra/feast-operator/test/utils/test_util.go
@@ -26,14 +26,64 @@ const (
 	FeastPrefix              = "feast-"
 	FeatureStoreName         = "simple-feast-setup"
 	FeastResourceName        = FeastPrefix + FeatureStoreName
+	APIVersionV1Alpha1       = "v1alpha1"
+	APIVersionV1             = "v1"
 )
 
+// cachedAPIVersion stores the detected API version to avoid repeated lookups
+var cachedAPIVersion string
+
+// getFeatureStoreAPIVersion detects the available API version from the CRD
+// Returns "v1" or "v1alpha1" depending on what's available
+func getFeatureStoreAPIVersion() string {
+	if cachedAPIVersion != "" {
+		return cachedAPIVersion
+	}
+
+	// Query the CRD to get available versions
+	cmd := exec.Command("kubectl", "get", "crd", "featurestores.feast.dev", "-o", "jsonpath={.spec.versions[*].name}")
+	output, err := cmd.Output()
+	if err != nil {
+		// Default to v1alpha1 for compatibility with older versions
+		fmt.Printf("Warning: Could not detect CRD versions, defaulting to %s: %v\n", APIVersionV1Alpha1, err)
+		cachedAPIVersion = APIVersionV1Alpha1
+		return cachedAPIVersion
+	}
+
+	versions := strings.TrimSpace(string(output))
+	fmt.Printf("Available CRD versions: %s\n", versions)
+
+	// Prefer v1 if available, otherwise use v1alpha1
+	if strings.Contains(versions, APIVersionV1+" ") || strings.HasSuffix(versions, APIVersionV1) || versions == APIVersionV1 {
+		cachedAPIVersion = APIVersionV1
+	} else if strings.Contains(versions, APIVersionV1Alpha1) {
+		cachedAPIVersion = APIVersionV1Alpha1
+	} else {
+		// Default fallback
+		cachedAPIVersion = APIVersionV1Alpha1
+	}
+
+	fmt.Printf("Using API version: %s\n", cachedAPIVersion)
+	return cachedAPIVersion
+}
+
+// getFeatureStoreResource returns the kubectl resource name with the correct API version
+// e.g., "featurestores.v1.feast.dev" or "featurestores.v1alpha1.feast.dev"
+func getFeatureStoreResource() string {
+	return fmt.Sprintf("featurestores.%s.feast.dev", getFeatureStoreAPIVersion())
+}
+
+// resetCachedAPIVersion resets the cached API version (useful when switching between operator versions)
+func resetCachedAPIVersion() {
+	cachedAPIVersion = ""
+}
+
 // dynamically checks if all conditions of custom resource featurestore are in "Ready" state.
 func checkIfFeatureStoreCustomResourceConditionsInReady(featureStoreName, namespace string) error {
 	// Wait 10 seconds to lets the feature store status update
 	time.Sleep(1 * time.Minute)
 
-	cmd := exec.Command("kubectl", "get", "featurestore", featureStoreName, "-n", namespace, "-o", "json")
+	cmd := exec.Command("kubectl", "get", getFeatureStoreResource(), featureStoreName, "-n", namespace, "-o", "json")
 
 	var out bytes.Buffer
 	var stderr bytes.Buffer
@@ -180,15 +230,15 @@ func isFeatureStoreHavingRemoteRegistry(namespace, featureStoreName string) (boo
 
 	for time.Since(startTime) < timeout {
 		// First check if the resource exists
-		checkCmd := exec.Command("kubectl", "get", "featurestore", featureStoreName, "-n", namespace)
+		checkCmd := exec.Command("kubectl", "get", getFeatureStoreResource(), featureStoreName, "-n", namespace)
 		if err := checkCmd.Run(); err != nil {
 			// Resource doesn't exist yet, retry
 			fmt.Printf("FeatureStore %s/%s does not exist yet, waiting...\n", namespace, featureStoreName)
 			time.Sleep(interval)
 			continue
 		}
 
-		cmd := exec.Command("kubectl", "get", "featurestore", featureStoreName, "-n", namespace,
+		cmd := exec.Command("kubectl", "get", getFeatureStoreResource(), featureStoreName, "-n", namespace,
 			"-o=jsonpath='{.status.applied.services.registry}'")
 
 		output, err := cmd.Output()
@@ -520,6 +570,9 @@ func DeployPreviousVersionOperator() {
 	_, err = Run(cmd, "/test/upgrade")
 	ExpectWithOffset(1, err).NotTo(HaveOccurred())
 
+	// Reset cached API version since we deployed a new operator with potentially different CRD version
+	resetCachedAPIVersion()
+
 	err = CheckIfDeploymentExistsAndAvailable(FeastControllerNamespace, ControllerDeploymentName, Timeout)
 	Expect(err).ToNot(HaveOccurred(), fmt.Sprintf(
 		"Deployment %s is not available but expected to be available. \nError: %v\n",
