Merge pull request #61487 from gmarek/condition

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix condition for using network unavailable taint in cloud_cidr_allocator Ref. #61481 The 'networkUnavailable' condition has, in a sense reverse logic. I.e. we should be trying to allocate CIRD when the condition is "true", i.e. when the taint exists. ```release-note NONE ``` @shyamjvs @agabet @bowei

Merge pull request #61487 from gmarek/condition
4f0ec7b1 · Kubernetes Submit Queue · GitHub · e40ffd71 · f93598ee · 4f0ec7b1
Unverified Commit 4f0ec7b1 authored Mar 21, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 21, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

cloud_cidr_allocator.go pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go +1 -1

No files found.
--- a/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
+++ b/pkg/controller/nodeipam/ipam/cloud_cidr_allocator.go
@@ -112,7 +112,7 @@ func NewCloudCIDRAllocator(client clientset.Interface, cloud cloudprovider.Inter
 			// set to true, we need to process the node to set the condition.
 			networkUnavailableTaint := &v1.Taint{Key: algorithm.TaintNodeNetworkUnavailable, Effect: v1.TaintEffectNoSchedule}
 			_, cond := v1node.GetNodeCondition(&newNode.Status, v1.NodeNetworkUnavailable)
-			if cond == nil || cond.Status != v1.ConditionFalse || !utiltaints.TaintExists(newNode.Spec.Taints, networkUnavailableTaint) {
+			if cond == nil || cond.Status != v1.ConditionFalse || utiltaints.TaintExists(newNode.Spec.Taints, networkUnavailableTaint) {
 				return ca.AllocateOrOccupyCIDR(newNode)
 			}
 			return nil