Skip to content

Commit 8f90afe

Browse files
committed
Make CAPI Azure the default install method
1 parent 762f80e commit 8f90afe

File tree

3 files changed

+3
-11
lines changed

3 files changed

+3
-11
lines changed

pkg/infrastructure/platform/platform.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
4444
case awstypes.Name:
4545
return clusterapi.InitializeProvider(&awscapi.Provider{}), nil
4646
case azuretypes.Name:
47-
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
48-
return clusterapi.InitializeProvider(&azureinfra.Provider{}), nil
49-
}
50-
return terraform.InitializeProvider(azure.PlatformStages), nil
47+
return clusterapi.InitializeProvider(&azureinfra.Provider{}), nil
5148
case azuretypes.StackTerraformName:
5249
return terraform.InitializeProvider(azure.StackPlatformStages), nil
5350
case baremetaltypes.Name:

pkg/infrastructure/platform/platform_altinfra.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
3434
case awstypes.Name:
3535
return clusterapi.InitializeProvider(&awscapi.Provider{}), nil
3636
case azuretypes.Name:
37-
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
38-
return clusterapi.InitializeProvider(&azurecapi.Provider{}), nil
39-
}
40-
return nil, nil
37+
return clusterapi.InitializeProvider(&azurecapi.Provider{}), nil
4138
case gcptypes.Name:
4239
return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
4340
case ibmcloudtypes.Name:

pkg/types/installconfig.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,12 +588,10 @@ func ClusterAPIFeatureGateEnabled(platform string, fgs featuregates.FeatureGate)
588588

589589
// Check if CAPI install is enabled for individual platforms.
590590
switch platform {
591-
case aws.Name, gcp.Name, nutanix.Name, openstack.Name, vsphere.Name:
591+
case aws.Name, azure.Name, gcp.Name, nutanix.Name, openstack.Name, vsphere.Name:
592592
return true
593593
case azure.StackTerraformName, azure.StackCloud.Name():
594594
return false
595-
case azure.Name:
596-
return fgs.Enabled(features.FeatureGateClusterAPIInstallAzure)
597595
case ibmcloud.Name:
598596
return fgs.Enabled(features.FeatureGateClusterAPIInstallIBMCloud)
599597
case powervs.Name:

0 commit comments

Comments
 (0)