Test now checks for OKD clusters that already have featureset enabled

Author: jatinsu

test/extended/apiserver/featuregate_okd.go

@@ -49,16 +49,23 @@ var _ = g.Describe("[sig-api-machinery][Feature:FeatureGate][OCPFeatureGate:OKD]
 			}
 		}()
 
-		// 4. Attempt to set OKD featureset
-		fg.Spec.FeatureSet = configv1.OKD
-		_, err = fgClient.Update(context.Background(), fg, metav1.UpdateOptions{})
-
-		// 5. Validate based on cluster type
+		// 4. Validate based on cluster type
 		if okdCluster {
-			// On OKD: should succeed
-			o.Expect(err).NotTo(o.HaveOccurred(), "OKD featureset should be allowed on OKD clusters")
+			// On OKD: OKD featureset should be allowed
+			// Check if it's already set to OKD (which will be the default on OKD clusters)
+			if originalFeatureSet == configv1.OKD {
+				// Already set to OKD - this is expected and valid on OKD clusters
+				o.Expect(originalFeatureSet).To(o.Equal(configv1.OKD), "OKD cluster should have OKD featureset")
+			} else {
+				// If not already OKD, attempt to set it and verify it's allowed
+				fg.Spec.FeatureSet = configv1.OKD
+				_, err = fgClient.Update(context.Background(), fg, metav1.UpdateOptions{})
+				o.Expect(err).NotTo(o.HaveOccurred(), "OKD featureset should be allowed on OKD clusters")
+			}
 		} else {
 			// On OCP: should be rejected
+			fg.Spec.FeatureSet = configv1.OKD
+			_, err = fgClient.Update(context.Background(), fg, metav1.UpdateOptions{})
 			o.Expect(err).To(o.HaveOccurred(), "OKD featureset should be rejected on OCP clusters")
 			o.Expect(err.Error()).To(o.ContainSubstring("OKD featureset is not supported on OpenShift clusters"))
 			o.Expect(k8serrors.IsForbidden(err)).To(o.BeTrue(), "Error should be a Forbidden error")