From c6d97ee1569043dbaaed2394acb6e53d31b3238c Mon Sep 17 00:00:00 2001 From: Antonio Ojea Date: Sun, 4 Apr 2021 11:23:42 +0200 Subject: [PATCH] kube-proxy copy node labels --- pkg/proxy/iptables/proxier.go | 12 ++++++++++-- pkg/proxy/ipvs/proxier.go | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pkg/proxy/iptables/proxier.go b/pkg/proxy/iptables/proxier.go index 7d276a5dd32..d186060396a 100644 --- a/pkg/proxy/iptables/proxier.go +++ b/pkg/proxy/iptables/proxier.go @@ -668,8 +668,12 @@ func (proxier *Proxier) OnNodeAdd(node *v1.Node) { } proxier.mu.Lock() - proxier.nodeLabels = node.Labels + proxier.nodeLabels = map[string]string{} + for k, v := range node.Labels { + proxier.nodeLabels[k] = v + } proxier.mu.Unlock() + klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels) proxier.syncProxyRules() } @@ -688,8 +692,12 @@ func (proxier *Proxier) OnNodeUpdate(oldNode, node *v1.Node) { } proxier.mu.Lock() - proxier.nodeLabels = node.Labels + proxier.nodeLabels = map[string]string{} + for k, v := range node.Labels { + proxier.nodeLabels[k] = v + } proxier.mu.Unlock() + klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels) proxier.syncProxyRules() } diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go index 9b6f66ad14e..de0bc4032c5 100644 --- a/pkg/proxy/ipvs/proxier.go +++ b/pkg/proxy/ipvs/proxier.go @@ -969,8 +969,12 @@ func (proxier *Proxier) OnNodeAdd(node *v1.Node) { } proxier.mu.Lock() - proxier.nodeLabels = node.Labels + proxier.nodeLabels = map[string]string{} + for k, v := range node.Labels { + proxier.nodeLabels[k] = v + } proxier.mu.Unlock() + klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels) proxier.syncProxyRules() } @@ -988,8 +992,12 @@ func (proxier *Proxier) OnNodeUpdate(oldNode, node *v1.Node) { } proxier.mu.Lock() - proxier.nodeLabels = node.Labels + proxier.nodeLabels = map[string]string{} + for k, v := range node.Labels { + proxier.nodeLabels[k] = v + } proxier.mu.Unlock() + klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels) proxier.syncProxyRules() }