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

Fix GCE instance lookup during validation 

ExternalID was deprecated and replaced by ProviderID, but the value of
ProviderID on GCE seems to have switched from instance ID to instance
Name.  Adopt a fallback matching strategy.
This commit is contained in:
Justin Santa Barbara 2018-07-23 02:09:25 -04:00
parent 25e0f37083
commit 934f6c9d4b
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
upup/pkg/fi/cloudup/gce/instancegroups.go
View File

@ -100,7 +100,16 @@ func getCloudGroups(c GCECloud, cluster *kops.Cluster, instancegroups []*kops.In
project := c.Project()
ctx := context.Background()
nodesByProviderID := cloudinstances.GetNodeMap(nodes, cluster)
nodesByExternalID := make(map[string]*v1.Node)
nodesByProviderID := make(map[string]*v1.Node)
for i := range nodes {
node := &nodes[i]
//ExternalID is deprecated in kubernetes 1.11 https://github.com/kubernetes/kubernetes/pull/61877
nodesByExternalID[node.Spec.ExternalID] = node
nodesByProviderID[node.Spec.ProviderID] = node
}
// There is some code duplication with resources/gce.go here, but more in the structure than a straight copy-paste
@ -171,7 +180,19 @@ func getCloudGroups(c GCECloud, cluster *kops.Cluster, instancegroups []*kops.In
CloudInstanceGroup: g,
}
node := nodesByProviderID[strconv.FormatUint(i.Id, 10)]
// Try first by provider ID
name := LastComponent(id)
providerID := "gce://" + project + "/" + zoneName + "/" + name
node := nodesByProviderID[providerID]
// fall back to lookup by external id
if node == nil {
glog.V(8).Infof("unable to find node by provider id %q, falling back to legacy external id", providerID)
externalID := strconv.FormatUint(i.Id, 10)
node = nodesByExternalID[externalID]
}
if node != nil {
cm.Node = node
} else {