Merge pull request openshift#8814 from mjturek/capi-default

MULTIARCH-4098: Power VS: Make CAPI the default deployment method

Author: openshift-merge-bot[bot]

go.mod

@@ -70,7 +70,7 @@ require (
 	github.com/nutanix-cloud-native/cluster-api-provider-nutanix v1.3.3-0.20240416171357-98239ba02cb2
 	github.com/nutanix-cloud-native/prism-go-client v0.3.4
 	github.com/onsi/gomega v1.33.1
-	github.com/openshift/api v0.0.0-20240808055311-bf71d8fa8155
+	github.com/openshift/api v0.0.0-20240808150900-cbdcd0df43e8
 	github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6
 	github.com/openshift/assisted-service/api v0.0.0
 	github.com/openshift/assisted-service/client v0.0.0

go.sum

@@ -764,8 +764,8 @@ github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQ
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
 github.com/opencontainers/runtime-spec v1.2.0 h1:z97+pHb3uELt/yiAWD691HNHQIF07bE7dzrbT927iTk=
 github.com/opencontainers/runtime-spec v1.2.0/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
-github.com/openshift/api v0.0.0-20240808055311-bf71d8fa8155 h1:+2bCTR9bwU6E2VmWJhTfd9yaDPaOGZ0B1S4rymX6BH8=
-github.com/openshift/api v0.0.0-20240808055311-bf71d8fa8155/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
+github.com/openshift/api v0.0.0-20240808150900-cbdcd0df43e8 h1:3rCq+cmukljkde0q/4EEPrGZzAL0zTbuX0GZNvwsHoc=
+github.com/openshift/api v0.0.0-20240808150900-cbdcd0df43e8/go.mod h1:OOh6Qopf21pSzqNVCB5gomomBXb8o5sGKZxG2KNpaXM=
 github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6 h1:U6ve+dnHlHhAELoxX+rdFOHVhoaYl0l9qtxwYtsO6C0=
 github.com/openshift/assisted-image-service v0.0.0-20240607085136-02df2e56dde6/go.mod h1:o2H5VwQhUD8P6XsK6dRmKpCCJqVvv12KJQZBXmcCXCU=
 github.com/openshift/assisted-service/api v0.0.0-20230831114549-1922eda29cf8 h1:+fZLKbycDo4JeLwPGVSAgf2XPaJGLM341l9ZfrrlxG0=

pkg/infrastructure/platform/platform.go

@@ -21,7 +21,6 @@ import (
 	"github.com/openshift/installer/pkg/terraform/stages/azure"
 	"github.com/openshift/installer/pkg/terraform/stages/ibmcloud"
 	"github.com/openshift/installer/pkg/terraform/stages/ovirt"
-	"github.com/openshift/installer/pkg/terraform/stages/powervs"
 	"github.com/openshift/installer/pkg/types"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
@@ -59,10 +58,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 	case nutanixtypes.Name:
 		return clusterapi.InitializeProvider(nutanixcapi.Provider{}), nil
 	case powervstypes.Name:
-		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
-			return clusterapi.InitializeProvider(&powervscapi.Provider{}), nil
-		}
-		return terraform.InitializeProvider(powervs.PlatformStages), nil
+		return clusterapi.InitializeProvider(&powervscapi.Provider{}), nil
 	case openstacktypes.Name:
 		return clusterapi.InitializeProvider(openstackcapi.Provider{}), nil
 	case ovirttypes.Name:

pkg/infrastructure/platform/platform_altinfra.go

@@ -45,10 +45,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 	case vspheretypes.Name:
 		return clusterapi.InitializeProvider(vspherecapi.Provider{}), nil
 	case powervstypes.Name:
-		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
-			return clusterapi.InitializeProvider(powervscapi.Provider{}), nil
-		}
-		return nil, nil
+		return clusterapi.InitializeProvider(powervscapi.Provider{}), nil
 	case openstacktypes.Name:
 		return clusterapi.InitializeProvider(openstackcapi.Provider{}), nil
 	case nutanixtypes.Name:

pkg/types/installconfig.go

@@ -588,14 +588,12 @@ func ClusterAPIFeatureGateEnabled(platform string, fgs featuregates.FeatureGate)
 
 	// Check if CAPI install is enabled for individual platforms.
 	switch platform {
-	case aws.Name, azure.Name, gcp.Name, nutanix.Name, openstack.Name, vsphere.Name:
+	case aws.Name, azure.Name, gcp.Name, nutanix.Name, openstack.Name, powervs.Name, vsphere.Name:
 		return true
 	case azure.StackTerraformName, azure.StackCloud.Name():
 		return false
 	case ibmcloud.Name:
 		return fgs.Enabled(features.FeatureGateClusterAPIInstallIBMCloud)
-	case powervs.Name:
-		return fgs.Enabled(features.FeatureGateClusterAPIInstallPowerVS)
 	default:
 		return false
 	}

vendor/github.com/openshift/api/features/features.go

@@ -1036,7 +1036,7 @@ github.com/opencontainers/image-spec/specs-go/v1
 # github.com/opencontainers/runtime-spec v1.2.0
 ## explicit
 github.com/opencontainers/runtime-spec/specs-go
-# github.com/openshift/api v0.0.0-20240808055311-bf71d8fa8155
+# github.com/openshift/api v0.0.0-20240808150900-cbdcd0df43e8
 ## explicit; go 1.22.0
 github.com/openshift/api/annotations
 github.com/openshift/api/config/v1