Merge pull request openshift#8090 from cjschaef/cors-3281

CORS-3281: IBMCloud: initial CAPI infrastructure

Author: openshift-merge-bot[bot]

pkg/infrastructure/ibmcloud/clusterapi/clusterapi.go

@@ -0,0 +1,24 @@
+package clusterapi
+
+import (
+	"context"
+
+	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
+	ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
+)
+
+var _ clusterapi.PreProvider = (*Provider)(nil)
+var _ clusterapi.Provider = (*Provider)(nil)
+
+// Provider implements IBM Cloud CAPI installation.
+type Provider struct{}
+
+// Name returns the IBM Cloud provider name.
+func (p Provider) Name() string {
+	return ibmcloudtypes.Name
+}
+
+// PreProvision creates the IBM Cloud objects required prior to running capibmcloud.
+func (p Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
+	return nil
+}

pkg/infrastructure/platform/platform.go

@@ -13,6 +13,7 @@ import (
 	azureinfra "github.com/openshift/installer/pkg/infrastructure/azure"
 	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
 	gcpcapi "github.com/openshift/installer/pkg/infrastructure/gcp/clusterapi"
+	ibmcloudcapi "github.com/openshift/installer/pkg/infrastructure/ibmcloud/clusterapi"
 	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"
@@ -70,6 +71,9 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 		}
 		return terraform.InitializeProvider(gcp.PlatformStages), nil
 	case ibmcloudtypes.Name:
+		if fg.Enabled(configv1.FeatureGateClusterAPIInstall) {
+			return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil
+		}
 		return terraform.InitializeProvider(ibmcloud.PlatformStages), nil
 	case libvirttypes.Name:
 		return terraform.InitializeProvider(libvirt.PlatformStages), nil

pkg/infrastructure/platform/platform_altinfra.go

@@ -13,13 +13,15 @@ import (
 	azurecapi "github.com/openshift/installer/pkg/infrastructure/azure"
 	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
 	gcpcapi "github.com/openshift/installer/pkg/infrastructure/gcp/clusterapi"
+	ibmcloudcapi "github.com/openshift/installer/pkg/infrastructure/ibmcloud/clusterapi"
 	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"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/featuregates"
 	gcptypes "github.com/openshift/installer/pkg/types/gcp"
+	ibmcloudtypes "github.com/openshift/installer/pkg/types/ibmcloud"
 	openstacktypes "github.com/openshift/installer/pkg/types/openstack"
 	powervstypes "github.com/openshift/installer/pkg/types/powervs"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
@@ -43,6 +45,11 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 			return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
 		}
 		return nil, nil
+	case ibmcloudtypes.Name:
+		if fg.Enabled(configv1.FeatureGateClusterAPIInstall) {
+			return clusterapi.InitializeProvider(ibmcloudcapi.Provider{}), nil
+		}
+		return nil, nil
 	case vspheretypes.Name:
 		if fg.Enabled(configv1.FeatureGateClusterAPIInstall) {
 			return clusterapi.InitializeProvider(vspherecapi.Provider{}), nil