Merge pull request #10114 from barbacbd/remove-gcp-endpoints-fg

no-jira: Remove the GCP Custom Endpoints Feature Gate

Author: openshift-merge-bot[bot]

pkg/types/gcp/validation/featuregates.go

@@ -1,22 +1,12 @@
 package validation
 
 import (
-	"k8s.io/apimachinery/pkg/util/validation/field"
-
-	features "github.com/openshift/api/features"
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/featuregates"
 )
 
 // GatedFeatures determines all of the install config fields that should
 // be validated to ensure that the proper featuregate is enabled when the field is used.
 func GatedFeatures(c *types.InstallConfig) []featuregates.GatedInstallConfigFeature {
-	g := c.GCP
-	return []featuregates.GatedInstallConfigFeature{
-		{
-			FeatureGateName: features.FeatureGateGCPCustomAPIEndpointsInstall,
-			Condition:       g.Endpoint != nil,
-			Field:           field.NewPath("platform", "gcp", "endpoint"),
-		},
-	}
+	return []featuregates.GatedInstallConfigFeature{}
 }

pkg/types/validation/featuregate_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/openshift/installer/pkg/types"
 	"github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/dns"
-	gcptypes "github.com/openshift/installer/pkg/types/gcp"
 	"github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -20,18 +19,6 @@ func TestFeatureGates(t *testing.T) {
 		installConfig *types.InstallConfig
 		expected      string
 	}{
-		{
-			name: "GCP Custom API Endpoints is not allowed without Feature Gates",
-			installConfig: func() *types.InstallConfig {
-				c := validInstallConfig()
-				c.GCP = validGCPPlatform()
-				c.GCP.Endpoint = &gcptypes.PSCEndpoint{
-					Name: "test-endpoint",
-				}
-				return c
-			}(),
-			expected: `^platform.gcp.endpoint: Forbidden: this field is protected by the GCPCustomAPIEndpointsInstall feature gate which must be enabled through either the TechPreviewNoUpgrade or CustomNoUpgrade feature set$`,
-		},
 		{
 			name: "AWS UserProvisionedDNS is not allowed without Feature Gates",
 			installConfig: func() *types.InstallConfig {