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

Author: mjturek

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
 	}