Skip to content

K
k3s
Commit affba42a authored by Rohit Jnagal's avatar Rohit Jnagal
Browse files
Options

Merge pull request #10958 from cjcullen/racefix

Remove race in setting/reading kubelet.podCIDR
parents ebc11e11 da0bc5f6
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/kubelet/kubelet.go
View file @ affba42a
...@@ -1959,6 +1959,7 @@ func (kl *Kubelet) syncNetworkStatus() { ...@@ -1959,6 +1959,7 @@ func (kl *Kubelet) syncNetworkStatus() {
glog.Errorf("Error on adding ip table rules: %v", err) glog.Errorf("Error on adding ip table rules: %v", err)
} }
if len(kl.podCIDR) == 0 { if len(kl.podCIDR) == 0 {
glog.Warningf("ConfigureCBR0 requested, but PodCIDR not set. Will not configure CBR0 right now")
networkConfigured = false networkConfigured = false
} else if err := kl.reconcileCBR0(kl.podCIDR); err != nil { } else if err := kl.reconcileCBR0(kl.podCIDR); err != nil {
networkConfigured = false networkConfigured = false
...@@ -2130,7 +2131,9 @@ func (kl *Kubelet) tryUpdateNodeStatus() error { ...@@ -2130,7 +2131,9 @@ func (kl *Kubelet) tryUpdateNodeStatus() error {
if node == nil { if node == nil {
return fmt.Errorf("no node instance returned for %q", kl.nodeName) return fmt.Errorf("no node instance returned for %q", kl.nodeName)
} }
kl.networkConfigMutex.Lock()
kl.podCIDR = node.Spec.PodCIDR kl.podCIDR = node.Spec.PodCIDR
kl.networkConfigMutex.Unlock()
if err := kl.setNodeStatus(node); err != nil { if err := kl.setNodeStatus(node); err != nil {
return err return err
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment