Merge pull request #19038 from sjenning/pick-59931

Automatic merge from submit-queue (batch tested with PRs 19008, 18727, 19038). UPSTREAM: 59931: do not delete node in openstack, if those still exist in cloudprovider kubernetes/kubernetes#59931 xref https://bugzilla.redhat.com/show_bug.cgi?id=1558422 Basically, the fix is to never filter instances by whether they are active or not. Just always return all instances. @derekwaynecarr
openshift · Mar 21, 2018 · 6709c04 · 6709c04
2 parents dbb5e7e + 36c6d34
commit 6709c04
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 13 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_instances.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_instances.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_routes.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_routes.go
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_volumes.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_volumes.go