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

Prefer the GA label for node zone

This commit is contained in:
John Gardiner Myers 2020-06-14 16:35:57 -07:00
parent d6f03b3f3f
commit a760080f01
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/validation/validate_cluster.go
View File

@ -340,11 +340,14 @@ func (v *ValidationCluster) validateNodes(cloudGroups map[string]*cloudinstances
n := &ValidationNode{
Name: node.Name,
Zone: node.ObjectMeta.Labels["failure-domain.beta.kubernetes.io/zone"],
Zone: node.ObjectMeta.Labels["topology.kubernetes.io/zone"],
Hostname: node.ObjectMeta.Labels["kubernetes.io/hostname"],
Role: role,
Status: getNodeReadyStatus(node),
}
if n.Zone == "" {
n.Zone = node.ObjectMeta.Labels["failure-domain.beta.kubernetes.io/zone"]
}
ready := isNodeReady(node)
if ready {