Merge pull request #984 from jhadvig/OCPBUGS-55698

OCPBUGS-55698: Lift FeatureGate by bumping openshift/api

Author: openshift-merge-bot[bot]

go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/go-bindata/go-bindata v3.1.2+incompatible
 	github.com/go-test/deep v1.0.5
 	github.com/google/go-cmp v0.6.0
-	github.com/openshift/api v0.0.0-20250402094343-3d7abe90f97e
+	github.com/openshift/api v0.0.0-20250414093238-eccb393dd5ab
 	github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c
 	github.com/openshift/client-go v0.0.0-20250402181141-b3bad3b645f2
 	github.com/openshift/library-go v0.0.0-20250402180609-ce2ba53fb2a4

go.sum

@@ -145,8 +145,8 @@ github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM
 github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
 github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=
 github.com/onsi/gomega v1.35.1/go.mod h1:PvZbdDc8J6XJEpDK4HCuRBm8a6Fzp9/DmhC9C7yFlog=
-github.com/openshift/api v0.0.0-20250402094343-3d7abe90f97e h1:+nJrGJMAhBH8yhXe7u3z44IWA/kHtzgjmpOAry+aeb4=
-github.com/openshift/api v0.0.0-20250402094343-3d7abe90f97e/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
+github.com/openshift/api v0.0.0-20250414093238-eccb393dd5ab h1:q47vclYZRp/RtV9yk4SVh5APfg8QVzKiK55T9gxmx1Y=
+github.com/openshift/api v0.0.0-20250414093238-eccb393dd5ab/go.mod h1:yk60tHAmHhtVpJQo3TwVYq2zpuP70iJIFDCmeKMIzPw=
 github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c h1:6XcszPFZpan4qll5XbdLll7n1So3IsPn28aw2j1obMo=
 github.com/openshift/build-machinery-go v0.0.0-20250102153059-e85a1a7ecb5c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
 github.com/openshift/client-go v0.0.0-20250402181141-b3bad3b645f2 h1:bPXR0R8zp1o12nSUphN26hSM+OKYq5pMorbDCpApzDQ=

test-e2e.sh

@@ -11,9 +11,6 @@ echo "Running tests..."
 if [ "$OPENSHIFT_CI" = true ]; then
     KUBERNETES_CONFIG=${KUBECONFIG} go test -timeout 30m -v ./test/e2e/ 2>&1 | tee "$ARTIFACT_DIR/test.out"
     RESULT="${PIPESTATUS[0]}"
-    # This is a hack for add prefix to the TestPluginsCSP* test names, so sippy can read them.
-    # Remove once the Featuregate is lifted.
-    sed -i 's/TestPluginsCSP/[OCPFeatureGate:ConsolePluginContentSecurityPolicy]&/g' "$ARTIFACT_DIR/test.out"
 
     go-junit-report < "$ARTIFACT_DIR/test.out" > "$ARTIFACT_DIR/junit.xml"
     if [ "$RESULT" -ne 0 ]; then

test/e2e/plugins_test.go

@@ -133,11 +133,6 @@ func cleanupTestCase(t *testing.T, client *framework.ClientSet, defaultPlugins,
 func TestPluginsCSPSinglePlugin(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPSinglePlugin))
 
 	for name, csp := range pluginCSPSinglePlugin {
@@ -150,11 +145,6 @@ func TestPluginsCSPSinglePlugin(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithoutCSP(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithoutCSP))
 
 	for name, csp := range pluginCSPMultiplePluginsWithoutCSP {
@@ -167,11 +157,6 @@ func TestPluginsCSPMultiplePluginsWithoutCSP(t *testing.T) {
 func TestPluginsCSPMultiplePlugins(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePlugins))
 
 	for name, csp := range pluginCSPMultiplePlugins {
@@ -184,11 +169,6 @@ func TestPluginsCSPMultiplePlugins(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithDuplicates(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithDuplicates))
 
 	for name, csp := range pluginCSPMultiplePluginsWithDuplicates {
@@ -200,11 +180,6 @@ func TestPluginsCSPMultiplePluginsWithDuplicates(t *testing.T) {
 func TestPluginsCSPMultiplePluginsWithMutualExclusion(t *testing.T) {
 	client, defaultPlugins := setupTestCase(t)
 
-	isFeatureGateSet := framework.IsFeatureGateSet(t, client)
-	if !isFeatureGateSet {
-		t.Skip("Feature gate not set, skipping test")
-	}
-
 	defer cleanupTestCase(t, client, defaultPlugins, maps.Keys(pluginCSPMultiplePluginsWithMutualExclusion))
 
 	for name, csp := range pluginCSPMultiplePluginsWithMutualExclusion {