Skip to content

Commit 94da1a4

Browse files
Merge pull request #324 from jcpowermac/remove-alibaba
SPLAT-1720: Remove Alibaba
2 parents 24c7c9c + a0fe9b1 commit 94da1a4

17 files changed

+23
-407
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ This operator is considered stable with unit and end-to-end testing against the
2222
| [OpenStack](https://github.com/openshift/cloud-provider-openstack) | Yes | Yes |
2323
| [vSphere](https://github.com/openshift/cloud-provider-vsphere) | Yes | Yes |
2424
| [IBM](https://github.com/openshift/cloud-provider-ibm) | Yes | |
25-
| [Alibaba](https://github.com/openshift/cloud-provider-alibaba-cloud) | Yes | Yes |
25+
| [Alibaba](https://github.com/openshift/cloud-provider-alibaba-cloud) | Removed | No |
2626
| [Power VS](https://github.com/openshift/cloud-provider-powervs) | Yes | |
2727
| [Nutanix](https://github.com/openshift/cloud-provider-nutanix) | Yes | Yes |
2828

manifests/0000_26_cloud-controller-manager-operator_01_images.configmap.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ data:
1111
images.json: >
1212
{
1313
"cloudControllerManagerOperator": "quay.io/openshift/origin-cluster-cloud-controller-manager-operator",
14-
"cloudControllerManagerAlibaba": "quay.io/openshift/origin-alibaba-cloud-controller-manager",
1514
"cloudControllerManagerAWS": "quay.io/openshift/origin-aws-cloud-controller-manager",
1615
"cloudControllerManagerAzure": "quay.io/openshift/origin-azure-cloud-controller-manager",
1716
"cloudNodeManagerAzure": "quay.io/openshift/origin-azure-cloud-node-manager",

manifests/0000_26_cloud-controller-manager-operator_02_rbac_operator.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,6 @@ rules:
106106
- create
107107
- patch
108108

109-
# alibaba has a separate node manager that uses the service account kube-system/alibaba-cloud-controller-manager.
110109
# The operator must have these permissions to then grant them to the alibaba node manager. (note it also uses some of the ones requred by vsphere)
111110
- apiGroups:
112111
- ""
@@ -127,7 +126,7 @@ rules:
127126
- patch
128127

129128
# nutanix has a separate node manager that uses the service account kube-system/nutanix-cloud-controller-manager.
130-
# The operator must have these permissions to then grant them to the nutanix node manager. (note it also uses some of the ones requred by vsphere and alibaba)
129+
# The operator must have these permissions to then grant them to the nutanix node manager. (note it also uses some of the ones requred by vsphere)
131130
- apiGroups:
132131
- ""
133132
resources:

manifests/image-references

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,6 @@ spec:
66
from:
77
kind: DockerImage
88
name: quay.io/openshift/origin-cluster-cloud-controller-manager-operator
9-
- name: alibaba-cloud-controller-manager
10-
from:
11-
kind: DockerImage
12-
name: quay.io/openshift/origin-alibaba-cloud-controller-manager
139
- name: aws-cloud-controller-manager
1410
from:
1511
kind: DockerImage

pkg/cloud/alibaba/alibaba.go

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

pkg/cloud/alibaba/alibaba_test.go

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

pkg/cloud/alibaba/assets/alibaba-cloud-controller-manager-clusterrole.yaml

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

pkg/cloud/alibaba/assets/alibaba-cloud-controller-manager-clusterrolebinding.yaml

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

pkg/cloud/alibaba/assets/alibaba-cloud-controller-manager-deployment.yaml

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

pkg/cloud/alibaba/assets/alibaba-cloud-controller-manager-role.yaml

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

0 commit comments

Comments
 (0)