Check CAPI-Install feature gate per platform

Adds the ability to check for a CAPI install feature gate per
platform, rather than only checking whether CAPI is enabled for
every platform. This will allow graduation of capi install
feature gates per platform.

Author: patrickdillon

pkg/asset/machines/master.go

@@ -17,7 +17,6 @@ import (
 	"sigs.k8s.io/yaml"
 
 	configv1 "github.com/openshift/api/config/v1"
-	"github.com/openshift/api/features"
 	machinev1 "github.com/openshift/api/machine/v1"
 	machinev1alpha1 "github.com/openshift/api/machine/v1alpha1"
 	machinev1beta1 "github.com/openshift/api/machine/v1beta1"
@@ -44,6 +43,7 @@ import (
 	"github.com/openshift/installer/pkg/asset/machines/ovirt"
 	"github.com/openshift/installer/pkg/asset/machines/powervs"
 	"github.com/openshift/installer/pkg/asset/machines/vsphere"
+	"github.com/openshift/installer/pkg/asset/manifests/capiutils"
 	"github.com/openshift/installer/pkg/asset/rhcos"
 	rhcosutils "github.com/openshift/installer/pkg/rhcos"
 	"github.com/openshift/installer/pkg/types"
@@ -271,7 +271,7 @@ func (m *Master) Generate(dependencies asset.Parents) error {
 		// so we don't want to include target pools in the control plane machineset.
 		// TODO(padillon): once this feature gate is the default and we are
 		// no longer using Terraform, we can update ConfigMasters not to populate this.
-		if ic.EnabledFeatureGates().Enabled(features.FeatureGateClusterAPIInstall) {
+		if capiutils.IsEnabled(installConfig) {
 			for _, machine := range machines {
 				providerSpec, ok := machine.Spec.ProviderSpec.Value.Object.(*machinev1beta1.GCPMachineProviderSpec)
 				if !ok {

pkg/asset/manifests/capiutils/helpers.go

@@ -1,9 +1,10 @@
 package capiutils
 
 import (
-	"github.com/openshift/api/features"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/ipnet"
+	"github.com/openshift/installer/pkg/types"
+	typesazure "github.com/openshift/installer/pkg/types/azure"
 )
 
 var (
@@ -21,7 +22,11 @@ func CIDRFromInstallConfig(installConfig *installconfig.InstallConfig) *ipnet.IP
 
 // IsEnabled returns true if the feature gate is enabled.
 func IsEnabled(installConfig *installconfig.InstallConfig) bool {
-	return installConfig.Config.EnabledFeatureGates().Enabled(features.FeatureGateClusterAPIInstall)
+	platform := installConfig.Config.Platform.Name()
+	if azure := installConfig.Config.Platform.Azure; azure != nil && azure.CloudName == typesazure.StackCloud {
+		platform = typesazure.StackTerraformName
+	}
+	return types.ClusterAPIFeatureGateEnabled(platform, installConfig.Config.EnabledFeatureGates())
 }
 
 // GenerateBoostrapMachineName generates the Cluster API Machine used for bootstrapping

pkg/infrastructure/platform/platform.go

@@ -30,6 +30,7 @@ import (
 	"github.com/openshift/installer/pkg/terraform/stages/ovirt"
 	"github.com/openshift/installer/pkg/terraform/stages/powervs"
 	"github.com/openshift/installer/pkg/terraform/stages/vsphere"
+	"github.com/openshift/installer/pkg/types"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
 	baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
@@ -50,15 +51,15 @@ import (
 func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastructure.Provider, error) {
 	switch platform {
 	case awstypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(&awscapi.Provider{}), nil
 		}
 		if fg.Enabled(features.FeatureGateInstallAlternateInfrastructureAWS) {
 			return awsinfra.InitializeProvider(), nil
 		}
 		return terraform.InitializeProvider(aws.PlatformStages), nil
 	case azuretypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(&azureinfra.Provider{}), nil
 		}
 		return terraform.InitializeProvider(azure.PlatformStages), nil
@@ -67,36 +68,36 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 	case baremetaltypes.Name:
 		return baremetalinfra.InitializeProvider(), nil
 	case gcptypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(gcp.PlatformStages), nil
 	case ibmcloudtypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(ibmcloud.PlatformStages), nil
 	case libvirttypes.Name:
 		return terraform.InitializeProvider(libvirt.PlatformStages), nil
 	case nutanixtypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(nutanixcapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(nutanix.PlatformStages), nil
 	case powervstypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(&powervscapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(powervs.PlatformStages), nil
 	case openstacktypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(openstackcapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(openstack.PlatformStages), nil
 	case ovirttypes.Name:
 		return terraform.InitializeProvider(ovirt.PlatformStages), nil
 	case vspheretypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(vspherecapi.Provider{}), nil
 		}
 		return terraform.InitializeProvider(vsphere.PlatformStages), nil

pkg/infrastructure/platform/platform_altinfra.go

@@ -6,7 +6,6 @@ package platform
 import (
 	"fmt"
 
-	"github.com/openshift/api/features"
 	"github.com/openshift/installer/pkg/infrastructure"
 	awscapi "github.com/openshift/installer/pkg/infrastructure/aws/clusterapi"
 	awsinfra "github.com/openshift/installer/pkg/infrastructure/aws/sdk"
@@ -18,6 +17,7 @@ import (
 	openstackcapi "github.com/openshift/installer/pkg/infrastructure/openstack/clusterapi"
 	powervscapi "github.com/openshift/installer/pkg/infrastructure/powervs/clusterapi"
 	vspherecapi "github.com/openshift/installer/pkg/infrastructure/vsphere/clusterapi"
+	"github.com/openshift/installer/pkg/types"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/featuregates"
@@ -33,40 +33,40 @@ import (
 func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastructure.Provider, error) {
 	switch platform {
 	case awstypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(&awscapi.Provider{}), nil
 		}
 		return awsinfra.InitializeProvider(), nil
 	case azuretypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(&azurecapi.Provider{}), nil
 		}
 		return nil, nil
 	case gcptypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
 		}
 		return nil, nil
 	case ibmcloudtypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil
 		}
 		return nil, nil
 	case vspheretypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(vspherecapi.Provider{}), nil
 		}
 	case powervstypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(powervscapi.Provider{}), nil
 		}
 		return nil, nil
 	case openstacktypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(openstackcapi.Provider{}), nil
 		}
 	case nutanixtypes.Name:
-		if fg.Enabled(features.FeatureGateClusterAPIInstall) {
+		if types.ClusterAPIFeatureGateEnabled(platform, fg) {
 			return clusterapi.InitializeProvider(nutanixcapi.Provider{}), nil
 		}
 	}

pkg/types/installconfig.go

@@ -558,3 +558,36 @@ func (c *InstallConfig) EnabledFeatureGates() featuregates.FeatureGate {
 
 	return fg
 }
+
+// ClusterAPIFeatureGateEnabled checks whether feature gates enabling
+// cluster api installs are enabled.
+func ClusterAPIFeatureGateEnabled(platform string, fgs featuregates.FeatureGate) bool {
+	// FeatureGateClusterAPIInstall enables for all platforms.
+	if fgs.Enabled(features.FeatureGateClusterAPIInstall) {
+		return true
+	}
+
+	// Check if CAPI install is enabled for individual platforms.
+	switch platform {
+	case aws.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallAWS)
+	case azure.StackTerraformName, azure.StackCloud.Name():
+		return false
+	case azure.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallAzure)
+	case gcp.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallGCP)
+	case ibmcloud.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallIBMCloud)
+	case nutanix.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallNutanix)
+	case openstack.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallOpenStack)
+	case powervs.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallPowerVS)
+	case vsphere.Name:
+		return fgs.Enabled(features.FeatureGateClusterAPIInstallVSphere)
+	default:
+		return false
+	}
+}