Remove Alibaba

Author: jcpowermac

hack/push-updates.sh

@@ -54,7 +54,6 @@ machine-api-provider-powervs
 machine-api-provider-nutanix
 cluster-api-provider-baremetal
 cluster-api-provider-ibmcloud
-cluster-api-provider-alibaba
 "
 
 TITLE=""

install/0000_30_machine-api-operator_00_credentials-request.yaml

@@ -316,38 +316,6 @@ spec:
 ---
 apiVersion: cloudcredential.openshift.io/v1
 kind: CredentialsRequest
-metadata:
-  name: openshift-machine-api-alibabacloud
-  namespace: openshift-cloud-credential-operator
-  annotations:
-    capability.openshift.io/name: MachineAPI+CloudCredential
-spec:
-  providerSpec:
-    apiVersion: cloudcredential.openshift.io/v1
-    kind: AlibabaCloudProviderSpec
-    statementEntries:
-      - action:
-        - ecs:DeleteInstances
-        - ecs:DescribeImages
-        - ecs:DescribeInstances
-        - ecs:DescribeSecurityGroups
-        - ecs:RunInstances
-        - ecs:StopInstances
-        - ecs:TagResources
-        effect: Allow
-        resource: '*'
-      - action:
-        - vpc:DescribeVpcs
-        - vpc:DescribeVSwitches
-        - ram:PassRole
-        resource: '*'
-        effect: Allow
-  secretRef:
-    namespace: openshift-machine-api
-    name: alibabacloud-credentials
----
-apiVersion: cloudcredential.openshift.io/v1
-kind: CredentialsRequest
 metadata:
   labels:
     controller-tools.k8s.io: "1.0"

install/0000_30_machine-api-operator_01_images.configmap.yaml

@@ -15,7 +15,6 @@ data:
       "machineAPIOperator": "quay.io/openshift/origin-machine-api-operator",
       "kubeRBACProxy": "quay.io/openshift/origin-kube-rbac-proxy",
       "clusterAPIControllerAWS": "quay.io/openshift/origin-aws-machine-controllers",
-      "clusterAPIControllerAlibaba": "quay.io/openshift/origin-alibaba-machine-controllers",
       "clusterAPIControllerOpenStack": "quay.io/openshift/origin-openstack-machine-api-provider",
       "clusterAPIControllerLibvirt": "quay.io/openshift/origin-libvirt-machine-controllers",
       "clusterAPIControllerBareMetal": "quay.io/openshift/origin-baremetal-machine-controllers",

install/image-references

@@ -50,10 +50,6 @@ spec:
     from:
       kind: DockerImage
       name: quay.io/openshift/origin-ovirt-machine-controllers
-  - name: alibaba-machine-controllers
-    from:
-      kind: DockerImage
-      name: quay.io/openshift/origin-alibaba-machine-controllers
   - name: nutanix-machine-controllers
     from:
       kind: DockerImage

pkg/operator/config.go

@@ -38,7 +38,6 @@ type Controllers struct {
 // Images allows build systems to inject images for MAO components
 type Images struct {
 	MachineAPIOperator            string `json:"machineAPIOperator"`
-	ClusterAPIControllerAlibaba   string `json:"clusterAPIControllerAlibaba"`
 	ClusterAPIControllerAWS       string `json:"clusterAPIControllerAWS"`
 	ClusterAPIControllerOpenStack string `json:"clusterAPIControllerOpenStack"`
 	ClusterAPIControllerLibvirt   string `json:"clusterAPIControllerLibvirt"`
@@ -79,8 +78,6 @@ func getProviderControllerFromImages(platform configv1.PlatformType, images Imag
 	switch platform {
 	case configv1.AWSPlatformType:
 		return images.ClusterAPIControllerAWS, nil
-	case configv1.AlibabaCloudPlatformType:
-		return images.ClusterAPIControllerAlibaba, nil
 	case configv1.LibvirtPlatformType:
 		return images.ClusterAPIControllerLibvirt, nil
 	case configv1.OpenStackPlatformType:
@@ -121,8 +118,6 @@ func getTerminationHandlerFromImages(platform configv1.PlatformType, images Imag
 		return images.ClusterAPIControllerGCP, nil
 	case configv1.AzurePlatformType:
 		return images.ClusterAPIControllerAzure, nil
-	case configv1.AlibabaCloudPlatformType:
-		return images.ClusterAPIControllerAlibaba, nil
 	default:
 		return clusterAPIControllerNoOp, nil
 	}

pkg/operator/config_test.go

@@ -7,14 +7,14 @@ import (
 	"path/filepath"
 	"testing"
 
-	configv1 "github.com/openshift/api/config/v1"
-	imagev1 "github.com/openshift/api/image/v1"
 	corev1 "k8s.io/api/core/v1"
 	"sigs.k8s.io/yaml"
+
+	configv1 "github.com/openshift/api/config/v1"
+	imagev1 "github.com/openshift/api/image/v1"
 )
 
 const (
-	expectedAlibabaImage   = "quay.io/openshift/origin-alibaba-machine-controllers"
 	expectedAWSImage       = "quay.io/openshift/origin-aws-machine-controllers"
 	expectedAzureImage     = "quay.io/openshift/origin-azure-machine-controllers"
 	expectedBareMetalImage = "quay.io/openshift/origin-baremetal-machine-controllers"
@@ -93,15 +93,6 @@ func TestGetProviderFromInfrastructure(t *testing.T) {
 			},
 		},
 		expected: configv1.AWSPlatformType,
-	}, {
-		infra: &configv1.Infrastructure{
-			Status: configv1.InfrastructureStatus{
-				PlatformStatus: &configv1.PlatformStatus{
-					Type: configv1.AlibabaCloudPlatformType,
-				},
-			},
-		},
-		expected: configv1.AlibabaCloudPlatformType,
 	}, {
 		infra: &configv1.Infrastructure{
 			Status: configv1.InfrastructureStatus{
@@ -280,10 +271,6 @@ func TestGetProviderControllerFromImages(t *testing.T) {
 			provider:      configv1.AWSPlatformType,
 			expectedImage: expectedAWSImage,
 		},
-		{
-			provider:      configv1.AlibabaCloudPlatformType,
-			expectedImage: expectedAlibabaImage,
-		},
 		{
 			provider:      configv1.LibvirtPlatformType,
 			expectedImage: expectedLibvirtImage,
@@ -369,10 +356,6 @@ func TestGetTerminationHandlerFromImages(t *testing.T) {
 			provider:      configv1.AWSPlatformType,
 			expectedImage: expectedAWSImage,
 		},
-		{
-			provider:      configv1.AlibabaCloudPlatformType,
-			expectedImage: expectedAlibabaImage,
-		},
 		{
 			provider:      configv1.LibvirtPlatformType,
 			expectedImage: clusterAPIControllerNoOp,

pkg/operator/operator_test.go

@@ -11,12 +11,6 @@ import (
 	"time"
 
 	. "github.com/onsi/gomega"
-	openshiftv1 "github.com/openshift/api/config/v1"
-	fakeos "github.com/openshift/client-go/config/clientset/versioned/fake"
-	configinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
-	fakemachine "github.com/openshift/client-go/machine/clientset/versioned/fake"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
-	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
 	"github.com/stretchr/testify/assert"
 	appsv1 "k8s.io/api/apps/v1"
 	kerrors "k8s.io/apimachinery/pkg/api/errors"
@@ -30,6 +24,13 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
+
+	openshiftv1 "github.com/openshift/api/config/v1"
+	fakeos "github.com/openshift/client-go/config/clientset/versioned/fake"
+	configinformersv1 "github.com/openshift/client-go/config/informers/externalversions"
+	fakemachine "github.com/openshift/client-go/machine/clientset/versioned/fake"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
+	"github.com/openshift/library-go/pkg/operator/resource/resourceapply"
 )
 
 const (
@@ -366,25 +367,6 @@ func TestMAOConfigFromInfrastructure(t *testing.T) {
 				PlatformType: openshiftv1.AWSPlatformType,
 			},
 		},
-		{
-			name:     string(openshiftv1.AlibabaCloudPlatformType),
-			platform: openshiftv1.AlibabaCloudPlatformType,
-			infra:    infra,
-			proxy:    proxy,
-			expectedConfig: &OperatorConfig{
-				TargetNamespace: targetNamespace,
-				Proxy:           proxy,
-				Controllers: Controllers{
-					Provider:           images.ClusterAPIControllerAlibaba,
-					MachineSet:         images.MachineAPIOperator,
-					NodeLink:           images.MachineAPIOperator,
-					MachineHealthCheck: images.MachineAPIOperator,
-					TerminationHandler: images.ClusterAPIControllerAlibaba,
-					KubeRBACProxy:      images.KubeRBACProxy,
-				},
-				PlatformType: openshiftv1.AlibabaCloudPlatformType,
-			},
-		},
 		{
 			name:     string(openshiftv1.LibvirtPlatformType),
 			platform: openshiftv1.LibvirtPlatformType,