Skip to content

K
k3s
Commit cdca508d authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub
Browse files
Options

Merge pull request #29599 from matttproud/refactor/simplify/nodecontroller

Automatic merge from submit-queue pkg/controller/node/nodecontroller: simplify mutex Similar to #29598, we can rely on the zero-value construction behavior to embed `sync.Mutex` into parent structs. /CC: @saad-ali
parents 42000793 76aab29e
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 3 deletions
pkg/controller/node/nodecontroller.go
View file @ cdca508d
...@@ -114,7 +114,7 @@ type NodeController struct { ...@@ -114,7 +114,7 @@ type NodeController struct {
nodeStatusMap map[string]nodeStatusData nodeStatusMap map[string]nodeStatusData
now func() unversioned.Time now func() unversioned.Time
// Lock to access evictor workers // Lock to access evictor workers
evictorLock *sync.Mutex evictorLock sync.Mutex
// workers that evicts pods from unresponsive nodes. // workers that evicts pods from unresponsive nodes.
zonePodEvictor map[string]*RateLimitedTimedQueue zonePodEvictor map[string]*RateLimitedTimedQueue
zoneTerminationEvictor map[string]*RateLimitedTimedQueue zoneTerminationEvictor map[string]*RateLimitedTimedQueue
...@@ -181,7 +181,6 @@ func NewNodeController( ...@@ -181,7 +181,6 @@ func NewNodeController(
glog.Fatal("NodeController: Invalid clusterCIDR, mask size of clusterCIDR must be less than nodeCIDRMaskSize.") glog.Fatal("NodeController: Invalid clusterCIDR, mask size of clusterCIDR must be less than nodeCIDRMaskSize.")
} }
} }
evictorLock := sync.Mutex{}
nc := &NodeController{ nc := &NodeController{
cloud: cloud, cloud: cloud,
...@@ -190,7 +189,6 @@ func NewNodeController( ...@@ -190,7 +189,6 @@ func NewNodeController(
recorder: recorder, recorder: recorder,
podEvictionTimeout: podEvictionTimeout, podEvictionTimeout: podEvictionTimeout,
maximumGracePeriod: 5 * time.Minute, maximumGracePeriod: 5 * time.Minute,
evictorLock: &evictorLock,
zonePodEvictor: make(map[string]*RateLimitedTimedQueue), zonePodEvictor: make(map[string]*RateLimitedTimedQueue),
zoneTerminationEvictor: make(map[string]*RateLimitedTimedQueue), zoneTerminationEvictor: make(map[string]*RateLimitedTimedQueue),
nodeStatusMap: make(map[string]nodeStatusData), nodeStatusMap: make(map[string]nodeStatusData),
......
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