changes associated with alibaba removal

This commit removes the ability to use the installer
and the Alibaba platform. All references to alibaba
are removed.

Author: jcpowermac

cmd/openshift-install/destroy.go

@@ -16,7 +16,6 @@ import (
 	quotaasset "github.com/openshift/installer/pkg/destroy/quota"
 	"github.com/openshift/installer/pkg/metrics/timer"
 
-	_ "github.com/openshift/installer/pkg/destroy/alibabacloud"
 	_ "github.com/openshift/installer/pkg/destroy/aws"
 	_ "github.com/openshift/installer/pkg/destroy/azure"
 	_ "github.com/openshift/installer/pkg/destroy/baremetal"

data/data/install.openshift.io_installconfigs.yaml

@@ -130,39 +130,6 @@ spec:
                   description: Platform is configuration for machine pool specific
                     to the platform.
                   properties:
-                    alibabacloud:
-                      description: AlibabaCloud is the configuration used when installing
-                        on Alibaba Cloud.
-                      properties:
-                        imageID:
-                          description: ImageID is the Image ID that should be used
-                            to create ECS instance. If set, the ImageID should belong
-                            to the same region as the cluster.
-                          type: string
-                        instanceType:
-                          description: InstanceType defines the ECS instance type.
-                            eg. ecs.g6.large
-                          type: string
-                        systemDiskCategory:
-                          description: SystemDiskCategory defines the category of
-                            the system disk.
-                          enum:
-                          - ""
-                          - cloud_efficiency
-                          - cloud_essd
-                          type: string
-                        systemDiskSize:
-                          description: SystemDiskSize defines the size of the system
-                            disk in gibibytes (GiB).
-                          minimum: 120
-                          type: integer
-                        zones:
-                          description: Zones is list of availability zones that can
-                            be used. eg. ["cn-hangzhou-i", "cn-hangzhou-h", "cn-hangzhou-j"]
-                          items:
-                            type: string
-                          type: array
-                      type: object
                     aws:
                       description: AWS is the configuration used when installing on
                         AWS.
@@ -1077,39 +1044,6 @@ spec:
                 description: Platform is configuration for machine pool specific to
                   the platform.
                 properties:
-                  alibabacloud:
-                    description: AlibabaCloud is the configuration used when installing
-                      on Alibaba Cloud.
-                    properties:
-                      imageID:
-                        description: ImageID is the Image ID that should be used to
-                          create ECS instance. If set, the ImageID should belong to
-                          the same region as the cluster.
-                        type: string
-                      instanceType:
-                        description: InstanceType defines the ECS instance type. eg.
-                          ecs.g6.large
-                        type: string
-                      systemDiskCategory:
-                        description: SystemDiskCategory defines the category of the
-                          system disk.
-                        enum:
-                        - ""
-                        - cloud_efficiency
-                        - cloud_essd
-                        type: string
-                      systemDiskSize:
-                        description: SystemDiskSize defines the size of the system
-                          disk in gibibytes (GiB).
-                        minimum: 120
-                        type: integer
-                      zones:
-                        description: Zones is list of availability zones that can
-                          be used. eg. ["cn-hangzhou-i", "cn-hangzhou-h", "cn-hangzhou-j"]
-                        items:
-                          type: string
-                        type: array
-                    type: object
                   aws:
                     description: AWS is the configuration used when installing on
                       AWS.
@@ -2010,7 +1944,7 @@ spec:
               values. For all other platforms, the field must not be set. AWS: \"Mint\",
               \"Passthrough\", \"Manual\" Azure: \"Passthrough\", \"Manual\" AzureStack:
               \"Manual\" GCP: \"Mint\", \"Passthrough\", \"Manual\" IBMCloud: \"Manual\"
-              AlibabaCloud: \"Manual\" PowerVS: \"Manual\" Nutanix: \"Manual\""
+              PowerVS: \"Manual\" Nutanix: \"Manual\""
             enum:
             - ""
             - Mint
@@ -2218,84 +2152,6 @@ spec:
             description: Platform is the configuration for the specific platform upon
               which to perform the installation.
             properties:
-              alibabacloud:
-                description: AlibabaCloud is the configuration used when installing
-                  on Alibaba Cloud.
-                properties:
-                  defaultMachinePlatform:
-                    description: DefaultMachinePlatform is the default configuration
-                      used when installing on Alibaba Cloud for machine pools which
-                      do not define their own platform configuration.
-                    properties:
-                      imageID:
-                        description: ImageID is the Image ID that should be used to
-                          create ECS instance. If set, the ImageID should belong to
-                          the same region as the cluster.
-                        type: string
-                      instanceType:
-                        description: InstanceType defines the ECS instance type. eg.
-                          ecs.g6.large
-                        type: string
-                      systemDiskCategory:
-                        description: SystemDiskCategory defines the category of the
-                          system disk.
-                        enum:
-                        - ""
-                        - cloud_efficiency
-                        - cloud_essd
-                        type: string
-                      systemDiskSize:
-                        description: SystemDiskSize defines the size of the system
-                          disk in gibibytes (GiB).
-                        minimum: 120
-                        type: integer
-                      zones:
-                        description: Zones is list of availability zones that can
-                          be used. eg. ["cn-hangzhou-i", "cn-hangzhou-h", "cn-hangzhou-j"]
-                        items:
-                          type: string
-                        type: array
-                    type: object
-                  privateZoneID:
-                    description: PrivateZoneID is the ID of an existing private zone
-                      into which to add DNS records for the cluster's internal API.
-                      An existing private zone can only be used when also using existing
-                      VPC. The private zone must be associated with the VPC containing
-                      the subnets. Leave the private zone unset to have the installer
-                      create the private zone on your behalf.
-                    type: string
-                  region:
-                    description: Region specifies the Alibaba Cloud region where the
-                      cluster will be created.
-                    type: string
-                  resourceGroupID:
-                    description: ResourceGroupID is the ID of an already existing
-                      resource group where the cluster should be installed. If empty,
-                      the installer will create a new resource group for the cluster.
-                    type: string
-                  tags:
-                    additionalProperties:
-                      type: string
-                    description: Tags additional keys and values that the installer
-                      will add as tags to all resources that it creates. Resources
-                      created by the cluster itself may not include these tags.
-                    type: object
-                  vpcID:
-                    description: VpcID is the ID of an already existing VPC where
-                      the cluster should be installed. If empty, the installer will
-                      create a new VPC for the cluster.
-                    type: string
-                  vswitchIDs:
-                    description: VSwitchIDs is the ID list of already existing VSwitches
-                      where cluster resources will be created. The existing VSwitches
-                      can only be used when also using existing VPC. If empty, the
-                      installer will create new VSwitches for the cluster.
-                    items:
-                      type: string
-                    type: array
-                required:
-                - region
-                type: object
               aws:
                 description: AWS is the configuration used when installing on AWS.
                 properties:

pkg/asset/cluster/metadata.go

@@ -9,7 +9,6 @@ import (
 
 	configv1 "github.com/openshift/api/config/v1"
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/openshift/installer/pkg/asset/cluster/alibabacloud"
 	"github.com/openshift/installer/pkg/asset/cluster/aws"
 	"github.com/openshift/installer/pkg/asset/cluster/azure"
 	"github.com/openshift/installer/pkg/asset/cluster/baremetal"
@@ -24,7 +23,6 @@ import (
 	"github.com/openshift/installer/pkg/asset/ignition/bootstrap"
 	"github.com/openshift/installer/pkg/asset/installconfig"
 	"github.com/openshift/installer/pkg/types"
-	alibabacloudtypes "github.com/openshift/installer/pkg/types/alibabacloud"
 	awstypes "github.com/openshift/installer/pkg/types/aws"
 	azuretypes "github.com/openshift/installer/pkg/types/azure"
 	baremetaltypes "github.com/openshift/installer/pkg/types/baremetal"
@@ -106,8 +104,6 @@ func (m *Metadata) Generate(parents asset.Parents) (err error) {
 		metadata.ClusterPlatformMetadata.Ovirt = ovirt.Metadata(installConfig.Config)
 	case vspheretypes.Name:
 		metadata.ClusterPlatformMetadata.VSphere = vsphere.Metadata(installConfig.Config)
-	case alibabacloudtypes.Name:
-		metadata.ClusterPlatformMetadata.AlibabaCloud = alibabacloud.Metadata(installConfig.Config)
 	case powervstypes.Name:
 		metadata.ClusterPlatformMetadata.PowerVS = powervs.Metadata(installConfig.Config, installConfig.PowerVS)
 	case externaltypes.Name, nonetypes.Name:

pkg/asset/cluster/tfvars.go

@@ -44,7 +44,6 @@ import (
 	"github.com/openshift/installer/pkg/asset/rhcos"
 	rhcospkg "github.com/openshift/installer/pkg/rhcos"
 	"github.com/openshift/installer/pkg/tfvars"
-	alibabacloudtfvars "github.com/openshift/installer/pkg/tfvars/alibabacloud"
 	awstfvars "github.com/openshift/installer/pkg/tfvars/aws"
 	azuretfvars "github.com/openshift/installer/pkg/tfvars/azure"
 	baremetaltfvars "github.com/openshift/installer/pkg/tfvars/baremetal"
@@ -57,7 +56,6 @@ import (
 	powervstfvars "github.com/openshift/installer/pkg/tfvars/powervs"
 	vspheretfvars "github.com/openshift/installer/pkg/tfvars/vsphere"
 	"github.com/openshift/installer/pkg/types"
-	"github.com/openshift/installer/pkg/types/alibabacloud"
 	"github.com/openshift/installer/pkg/types/aws"
 	"github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/baremetal"
@@ -1103,76 +1101,6 @@ func (t *TerraformVariables) Generate(parents asset.Parents) error {
 			Data:     data,
 		})
 
-	case alibabacloud.Name:
-		client, err := installConfig.AlibabaCloud.Client()
-		if err != nil {
-			return errors.Wrapf(err, "failed to create new client use region %s", installConfig.Config.Platform.AlibabaCloud.Region)
-		}
-		bucket := fmt.Sprintf("%s-bootstrap", clusterID.InfraID)
-		object := "bootstrap.ign"
-		signURL, err := client.GetOSSObjectSignURL(bucket, object)
-		if err != nil {
-			return errors.Wrapf(err, "failed to get a presigned URL for OSS object %s", object)
-		}
-
-		auth := alibabacloudtfvars.Auth{
-			AccessKey: client.AccessKeyID,
-			SecretKey: client.AccessKeySecret,
-		}
-
-		masters, err := mastersAsset.Machines()
-		if err != nil {
-			return errors.Wrapf(err, "failed to get master machine info")
-		}
-		masterConfigs := make([]*machinev1.AlibabaCloudMachineProviderConfig, len(masters))
-		for i, m := range masters {
-			masterConfigs[i] = m.Spec.ProviderSpec.Value.Object.(*machinev1.AlibabaCloudMachineProviderConfig)
-		}
-		workers, err := workersAsset.MachineSets()
-		if err != nil {
-			return errors.Wrapf(err, "failed to get worker machine info")
-		}
-		workerConfigs := make([]*machinev1.AlibabaCloudMachineProviderConfig, len(workers))
-		for i, w := range workers {
-			workerConfigs[i] = w.Spec.Template.Spec.ProviderSpec.Value.Object.(*machinev1.AlibabaCloudMachineProviderConfig)
-		}
-
-		natGatewayZones, err := client.ListEnhanhcedNatGatewayAvailableZones()
-		if err != nil {
-			return errors.Wrapf(err, "failed to list available zones for NAT gateway")
-		}
-		natGatewayZoneID := natGatewayZones.Zones[0].ZoneId
-
-		vswitchIDs := []string{}
-		if len(installConfig.Config.AlibabaCloud.VSwitchIDs) > 0 {
-			vswitchIDs = installConfig.Config.AlibabaCloud.VSwitchIDs
-		}
-		data, err := alibabacloudtfvars.TFVars(
-			alibabacloudtfvars.TFVarsSources{
-				Auth:                  auth,
-				VpcID:                 installConfig.Config.AlibabaCloud.VpcID,
-				VSwitchIDs:            vswitchIDs,
-				PrivateZoneID:         installConfig.Config.AlibabaCloud.PrivateZoneID,
-				ResourceGroupID:       installConfig.Config.AlibabaCloud.ResourceGroupID,
-				BaseDomain:            installConfig.Config.BaseDomain,
-				NatGatewayZoneID:      natGatewayZoneID,
-				MasterConfigs:         masterConfigs,
-				WorkerConfigs:         workerConfigs,
-				IgnitionBucket:        bucket,
-				IgnitionPresignedURL:  signURL,
-				AdditionalTrustBundle: installConfig.Config.AdditionalTrustBundle,
-				Architecture:          installConfig.Config.ControlPlane.Architecture,
-				Publish:               installConfig.Config.Publish,
-				Proxy:                 installConfig.Config.Proxy,
-			},
-		)
-		if err != nil {
-			return errors.Wrapf(err, "failed to get %s Terraform variables", platform)
-		}
-		t.FileList = append(t.FileList, &asset.File{
-			Filename: TfPlatformVarsFileName,
-			Data:     data,
-		})
 	case nutanix.Name:
 		if rhcosImage == nil {
 			return errors.New("unable to retrieve rhcos image")

pkg/asset/installconfig/basedomain.go

@@ -6,13 +6,11 @@ import (
 	"github.com/pkg/errors"
 
 	"github.com/openshift/installer/pkg/asset"
-	alibabacloudconfig "github.com/openshift/installer/pkg/asset/installconfig/alibabacloud"
 	awsconfig "github.com/openshift/installer/pkg/asset/installconfig/aws"
 	azureconfig "github.com/openshift/installer/pkg/asset/installconfig/azure"
 	gcpconfig "github.com/openshift/installer/pkg/asset/installconfig/gcp"
 	ibmcloudconfig "github.com/openshift/installer/pkg/asset/installconfig/ibmcloud"
 	powervsconfig "github.com/openshift/installer/pkg/asset/installconfig/powervs"
-	"github.com/openshift/installer/pkg/types/alibabacloud"
 	"github.com/openshift/installer/pkg/types/aws"
 	"github.com/openshift/installer/pkg/types/azure"
 	"github.com/openshift/installer/pkg/types/gcp"
@@ -41,12 +39,6 @@ func (a *baseDomain) Generate(parents asset.Parents) error {
 
 	var err error
 	switch platform.CurrentName() {
-	case alibabacloud.Name:
-		a.BaseDomain, err = alibabacloudconfig.GetBaseDomain()
-		if err != nil {
-			return err
-		}
-		return nil
 	case aws.Name:
 		a.BaseDomain, err = awsconfig.GetBaseDomain()
 		cause := errors.Cause(err)

pkg/asset/installconfig/installconfig.go

@@ -9,7 +9,6 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation/field"
 
 	"github.com/openshift/installer/pkg/asset"
-	"github.com/openshift/installer/pkg/asset/installconfig/alibabacloud"
 	"github.com/openshift/installer/pkg/asset/installconfig/aws"
 	icazure "github.com/openshift/installer/pkg/asset/installconfig/azure"
 	icgcp "github.com/openshift/installer/pkg/asset/installconfig/gcp"
@@ -31,11 +30,10 @@ const (
 // InstallConfig generates the install-config.yaml file.
 type InstallConfig struct {
 	AssetBase
-	AWS          *aws.Metadata          `json:"aws,omitempty"`
-	Azure        *icazure.Metadata      `json:"azure,omitempty"`
-	IBMCloud     *icibmcloud.Metadata   `json:"ibmcloud,omitempty"`
-	AlibabaCloud *alibabacloud.Metadata `json:"alibabacloud,omitempty"`
-	PowerVS      *icpowervs.Metadata    `json:"powervs,omitempty"`
+	AWS      *aws.Metadata        `json:"aws,omitempty"`
+	Azure    *icazure.Metadata    `json:"azure,omitempty"`
+	IBMCloud *icibmcloud.Metadata `json:"ibmcloud,omitempty"`
+	PowerVS  *icpowervs.Metadata  `json:"powervs,omitempty"`
 }
 
 var _ asset.WritableAsset = (*InstallConfig)(nil)
@@ -88,7 +86,6 @@ func (a *InstallConfig) Generate(parents asset.Parents) error {
 		PullSecret: pullSecret.PullSecret,
 	}
 
-	a.Config.AlibabaCloud = platform.AlibabaCloud
 	a.Config.AWS = platform.AWS
 	a.Config.Libvirt = platform.Libvirt
 	a.Config.None = platform.None
@@ -146,9 +143,6 @@ func (a *InstallConfig) finish(filename string) error {
 			return err
 		}
 	}
-	if a.Config.AlibabaCloud != nil {
-		a.AlibabaCloud = alibabacloud.NewMetadata(a.Config.AlibabaCloud.Region, a.Config.AlibabaCloud.VSwitchIDs)
-	}
 	if a.Config.Azure != nil {
 		a.Azure = icazure.NewMetadata(a.Config.Azure.CloudName, a.Config.Azure.ARMEndpoint)
 	}
@@ -177,13 +171,6 @@ func (a *InstallConfig) finish(filename string) error {
 // underlying platform. In some cases, platforms also duplicate validations
 // that have already been checked by validation.ValidateInstallConfig().
 func (a *InstallConfig) platformValidation() error {
-	if a.Config.Platform.AlibabaCloud != nil {
-		client, err := a.AlibabaCloud.Client()
-		if err != nil {
-			return err
-		}
-		return alibabacloud.Validate(client, a.Config)
-	}
 	if a.Config.Platform.Azure != nil {
 		if a.Config.Platform.Azure.IsARO() {
 			// ARO performs platform validation in the Resource Provider before