Merge pull request openshift#8011 from barbacbd/capg-basic-infrastructure

CORS-3220: Initiate CAPG installation

Author: openshift-merge-bot[bot]

pkg/asset/cluster/cluster.go

@@ -19,9 +19,11 @@ import (
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/asset/kubeconfig"
 	"github.com/openshift/installer/pkg/asset/machines"
+	"github.com/openshift/installer/pkg/asset/manifests"
 	capimanifests "github.com/openshift/installer/pkg/asset/manifests/clusterapi"
 	"github.com/openshift/installer/pkg/asset/password"
 	"github.com/openshift/installer/pkg/asset/quota"
+	"github.com/openshift/installer/pkg/asset/rhcos"
 	infra "github.com/openshift/installer/pkg/infrastructure/platform"
 	typesaws "github.com/openshift/installer/pkg/types/aws"
 	typesazure "github.com/openshift/installer/pkg/types/azure"
@@ -67,6 +69,8 @@ func (c *Cluster) Dependencies() []asset.Asset {
 		&bootstrap.Bootstrap{},
 		&machine.Master{},
 		&machines.ClusterAPI{},
+		new(rhcos.Image),
+		&manifests.Manifests{},
 	}
 }
 

pkg/infrastructure/clusterapi/clusterapi.go

@@ -206,6 +206,7 @@ func (i *InfraProvider) Provision(dir string, parents asset.Parents) ([]*asset.F
 	// bootstrap ignition behavior.
 	if p, ok := i.impl.(IgnitionProvider); ok {
 		ignInput := IgnitionInput{
+			Client:           cl,
 			BootstrapIgnData: bootstrapIgnData,
 			InfraID:          clusterID.InfraID,
 			InstallConfig:    installConfig,

pkg/infrastructure/clusterapi/types.go

@@ -44,6 +44,7 @@ type IgnitionProvider interface {
 
 // IgnitionInput collects the args passed to the IgnitionProvider call.
 type IgnitionInput struct {
+	Client           client.Client
 	BootstrapIgnData []byte
 	InfraID          string
 	InstallConfig    *installconfig.InstallConfig

pkg/infrastructure/gcp/clusterapi/clusterapi.go

@@ -0,0 +1,50 @@
+package clusterapi
+
+import (
+	"context"
+
+	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
+	gcptypes "github.com/openshift/installer/pkg/types/gcp"
+)
+
+// Provider implements gcp infrastructure in conjunction with the
+// GCP CAPI provider.
+type Provider struct {
+}
+
+var _ clusterapi.PreProvider = (*Provider)(nil)
+var _ clusterapi.IgnitionProvider = (*Provider)(nil)
+var _ clusterapi.InfraReadyProvider = (*Provider)(nil)
+var _ clusterapi.PostProvider = (*Provider)(nil)
+
+// Name returns the name for the platform.
+func (p Provider) Name() string {
+	return gcptypes.Name
+}
+
+// PreProvision is called before provisioning using CAPI controllers has initiated.
+// GCP resources that are not created by CAPG (and are required for other stages of the install) are
+// created here using the gcp sdk.
+func (p Provider) PreProvision(ctx context.Context, in clusterapi.PreProvisionInput) error {
+	return nil
+}
+
+// Ignition provisions the GCP bucket and url that points to the bucket. Bootstrap ignition data cannot
+// populate the metadata field of the bootstrap instance as the data can be too large. Instead, the data is
+// added to a bucket. A signed url is generated to point to the bucket and the ignition data will be
+// updated to point to the url. This is also allows for bootstrap data to be edited after its initial creation.
+func (p Provider) Ignition(ctx context.Context, in clusterapi.IgnitionInput) ([]byte, error) {
+	return nil, nil
+}
+
+// InfraReady is called once cluster.Status.InfrastructureReady
+// is true, typically after load balancers have been provisioned. It can be used
+// to create DNS records.
+func (p Provider) InfraReady(ctx context.Context, in clusterapi.InfraReadyInput) error {
+	return nil
+}
+
+// PostProvision should be called to add or update and GCP resources after provisioning has completed.
+func (p Provider) PostProvision(ctx context.Context, in clusterapi.PostProvisionInput) error {
+	return nil
+}

pkg/infrastructure/platform/platform.go

@@ -9,6 +9,8 @@ import (
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/infrastructure"
 	awsinfra "github.com/openshift/installer/pkg/infrastructure/aws"
+	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
+	gcpcapi "github.com/openshift/installer/pkg/infrastructure/gcp/clusterapi"
 	"github.com/openshift/installer/pkg/terraform"
 	"github.com/openshift/installer/pkg/terraform/stages/aws"
 	"github.com/openshift/installer/pkg/terraform/stages/azure"
@@ -52,6 +54,9 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 	case baremetaltypes.Name:
 		return terraform.InitializeProvider(baremetal.PlatformStages), nil
 	case gcptypes.Name:
+		if fg.Enabled(configv1.FeatureGateClusterAPIInstall) {
+			return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
+		}
 		return terraform.InitializeProvider(gcp.PlatformStages), nil
 	case ibmcloudtypes.Name:
 		return terraform.InitializeProvider(ibmcloud.PlatformStages), nil

pkg/infrastructure/platform/platform_altinfra.go

@@ -6,11 +6,15 @@ package platform
 import (
 	"fmt"
 
+	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/infrastructure"
 	"github.com/openshift/installer/pkg/infrastructure/aws"
+	"github.com/openshift/installer/pkg/infrastructure/clusterapi"
+	gcpcapi "github.com/openshift/installer/pkg/infrastructure/gcp/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"
 	vspheretypes "github.com/openshift/installer/pkg/types/vsphere"
 )
 
@@ -22,6 +26,11 @@ func ProviderForPlatform(platform string, fg featuregates.FeatureGate) (infrastr
 	case azuretypes.Name:
 		panic("not implemented")
 		return nil, nil
+	case gcptypes.Name:
+		if fg.Enabled(configv1.FeatureGateClusterAPIInstall) {
+			return clusterapi.InitializeProvider(gcpcapi.Provider{}), nil
+		}
+		return nil, nil
 	case vspheretypes.Name:
 		panic("not implemented")
 		return nil, nil