github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #101583 from aojea/kproxycopylabels

Browse Source 
kube-proxy copy node labels
This commit is contained in:
Kubernetes Prow Robot 2021-04-28 10:33:15 -07:00 committed by GitHub
commit dc6b04c142
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/proxy/iptables/proxier.go
View File

@ -668,8 +668,12 @@ func (proxier *Proxier) OnNodeAdd(node *v1.Node) {
} }
proxier.mu.Lock() 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() proxier.mu.Unlock()
klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels)
proxier.syncProxyRules() proxier.syncProxyRules()
} }
@ -688,8 +692,12 @@ func (proxier *Proxier) OnNodeUpdate(oldNode, node *v1.Node) {
} }
proxier.mu.Lock() 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() proxier.mu.Unlock()
klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels)
proxier.syncProxyRules() proxier.syncProxyRules()
} }

12
pkg/proxy/ipvs/proxier.go
View File

@ -969,8 +969,12 @@ func (proxier *Proxier) OnNodeAdd(node *v1.Node) {
} }
proxier.mu.Lock() 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() proxier.mu.Unlock()
klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels)
proxier.syncProxyRules() proxier.syncProxyRules()
} }
@ -988,8 +992,12 @@ func (proxier *Proxier) OnNodeUpdate(oldNode, node *v1.Node) {
} }
proxier.mu.Lock() 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() proxier.mu.Unlock()
klog.V(4).InfoS("Updated proxier node labels", "labels", node.Labels)
proxier.syncProxyRules() proxier.syncProxyRules()
} }