github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 08:17:26 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10958 from cjcullen/racefix

Browse Source 
Remove race in setting/reading kubelet.podCIDR
This commit is contained in:
Rohit Jnagal 2015-07-10 10:09:44 -07:00
commit affba42a05
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@ -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 {
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