Skip to content

Commit 49f8133

Browse files
committed
CORS-3594: MOVE GCP CAPI to default feature set
** Set the default gcp install to use CAPI not terraform. ** Remove the terraform stages (not the terraform files) for gcp.
1 parent 7a6c091 commit 49f8133

File tree

5 files changed

+3
-156
lines changed

5 files changed

+3
-156
lines changed

pkg/infrastructure/platform/platform.go

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ import (
1919
vspherecapi "github.com/openshift/installer/pkg/infrastructure/vsphere/clusterapi"
2020
"github.com/openshift/installer/pkg/terraform"
2121
"github.com/openshift/installer/pkg/terraform/stages/azure"
22-
"github.com/openshift/installer/pkg/terraform/stages/gcp"
2322
"github.com/openshift/installer/pkg/terraform/stages/ibmcloud"
2423
"github.com/openshift/installer/pkg/terraform/stages/ovirt"
2524
"github.com/openshift/installer/pkg/terraform/stages/powervs"
@@ -54,10 +53,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
5453
case baremetaltypes.Name:
5554
return baremetalinfra.InitializeProvider(), nil
5655
case gcptypes.Name:
57-
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
58-
return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
59-
}
60-
return terraform.InitializeProvider(gcp.PlatformStages), nil
56+
return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
6157
case ibmcloudtypes.Name:
6258
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
6359
return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil

pkg/infrastructure/platform/platform_altinfra.go

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
3939
}
4040
return nil, nil
4141
case gcptypes.Name:
42-
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
43-
return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
44-
}
45-
return nil, nil
42+
return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
4643
case ibmcloudtypes.Name:
4744
if types.ClusterAPIFeatureGateEnabled(platform, fg) {
4845
return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil

pkg/terraform/stages/gcp/OWNERS

Lines changed: 0 additions & 7 deletions
This file was deleted.

pkg/terraform/stages/gcp/stages.go

Lines changed: 0 additions & 137 deletions
This file was deleted.

pkg/types/installconfig.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -588,14 +588,12 @@ 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, nutanix.Name, openstack.Name, vsphere.Name:
591+
case aws.Name, gcp.Name, nutanix.Name, openstack.Name, vsphere.Name:
592592
return true
593593
case azure.StackTerraformName, azure.StackCloud.Name():
594594
return false
595595
case azure.Name:
596596
return fgs.Enabled(features.FeatureGateClusterAPIInstallAzure)
597-
case gcp.Name:
598-
return fgs.Enabled(features.FeatureGateClusterAPIInstallGCP)
599597
case ibmcloud.Name:
600598
return fgs.Enabled(features.FeatureGateClusterAPIInstallIBMCloud)
601599
case powervs.Name:

0 commit comments

Comments
 (0)