Merge pull request #20369 from aveshagarwal/release-3.10-cloud-resour…

…ce-sync-manager Pick cloud resource sync manager related fixes.
openshift · Jul 19, 2018 · 228b971 · 228b971
2 parents 4d0bba3 + 0f1103b
commit 228b971
Show file tree

Hide file tree

Showing 7 changed files with 247 additions and 55 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
diff --git a/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status_test.go b/vendor/k8s.io/kubernetes/pkg/kubelet/kubelet_node_status_test.go