Merge pull request #10413 from rdrgmnzs/fix-bootstrapMasterNodeLabels

protokube - query host by label when setting tags
This commit is contained in:
Kubernetes Prow Robot 2020-12-17 23:36:25 -08:00 committed by GitHub
commit cbb418cb89
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 1 deletions

View File

@ -34,10 +34,17 @@ func bootstrapMasterNodeLabels(ctx context.Context, kubeContext *KubernetesConte
}
klog.V(2).Infof("Querying k8s for node %q", nodeName)
node, err := client.CoreV1().Nodes().Get(ctx, nodeName, metav1.GetOptions{})
labelSelector := fmt.Sprintf("kubernetes.io/hostname=%s", nodeName)
listOptions := metav1.ListOptions{
LabelSelector: labelSelector,
}
nodes, err := client.CoreV1().Nodes().List(ctx, listOptions)
if err != nil {
return fmt.Errorf("error querying node %q: %v", nodeName, err)
} else if len(nodes.Items) != 1 {
return fmt.Errorf("error querying node %q: expected 1 node with label %v, found %d", nodeName, labelSelector, len(nodes.Items))
}
node := nodes.Items[0]
labels := map[string]string{
"node-role.kubernetes.io/master": "",