kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Alicloud: split ProviderID with "."

This commit is contained in:
Xiaoyu Zhong 2019-10-30 18:11:15 +08:00
parent 69fe8e3689
commit 9d61c1d1a7
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/cloudinstances/cloud_instance_group.go
View File

@ -87,10 +87,16 @@ func (c *CloudInstanceGroup) Status() string {
// GetNodeMap returns a list of nodes keyed by their external id
func GetNodeMap(nodes []v1.Node, cluster *kops.Cluster) map[string]*v1.Node {
nodeMap := make(map[string]*v1.Node)
delimiter := "/"
// Alicloud CCM uses the "{region}.{instance-id}" of a instance as ProviderID.
// We need to set delimiter to "." for Alicloud.
if kops.CloudProviderID(cluster.Spec.CloudProvider) == kops.CloudProviderALI {
delimiter = "."
}
for i := range nodes {
node := &nodes[i]
providerIDs := strings.Split(node.Spec.ProviderID, "/")
providerIDs := strings.Split(node.Spec.ProviderID, delimiter)
instanceID := providerIDs[len(providerIDs)-1]
nodeMap[instanceID] = node
}