Merge pull request #20615 from ingvagabund/backport-retrieve-node-add…

…ress-logic-from-upstream Backport retrieve node address logic from upstream
openshift · Aug 17, 2018 · 3c717d7 · 3c717d7
2 parents 0e27a7d + d196468
commit 3c717d7
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 56 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/fake/fake.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/fake/fake.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD b/vendor/k8s.io/kubernetes/pkg/kubelet/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cloud_request_manager.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cloud_request_manager.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/cloud_request_manager_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/cloud_request_manager_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet.go
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status.go