Merge pull request openshift#21807 from danwinship/cloud-node-ip

UPSTREAM: 70805: Fix a CloudProvider-vs-nodeIP edge case
anurags9810 · Feb 1, 2019 · 323fc6c · 323fc6c
2 parents a1f6aa7 + bd6a57e
commit 323fc6c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/nodestatus/setters_test.go