Skip to content

Commit 6709c04

Browse files
openshift-merge-robotopenshift-merge-robot
authored
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
2 parents dbb5e7e + 36c6d34 commit 6709c04

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

‎vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack.go

Lines changed: 3 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_instances.go

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_routes.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/openstack/openstack_volumes.go

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)