Skip to content

Commit 34c5041

Browse files
openshift-merge-robotopenshift-merge-robot
authored
Merge pull request #18552 from jsafrane/recycle-used-pv
Automatic merge from submit-queue. UPSTREAM: 59350: Do not recycle volumes that are used by pods https://bugzilla.redhat.com/show_bug.cgi?id=1494257 /assign @gnufied @rootfs for review /assign @deads2k for approval
2 parents 6226160 + fab7212 commit 34c5041

File tree

11 files changed

+135
-7
lines changed

11 files changed

+135
-7
lines changed

‎vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go

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

‎vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/BUILD

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

‎vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/binder_test.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.

‎vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/delete_test.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/controller/volume/persistentvolume/framework_test.go

Lines changed: 9 additions & 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/controller/volume/persistentvolume/provision_test.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/controller/volume/persistentvolume/pv_controller.go

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

‎vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_base.go

Lines changed: 4 additions & 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/controller/volume/persistentvolume/recycle_test.go

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

‎vendor/k8s.io/kubernetes/test/integration/scheduler/volume_binding_test.go

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

‎vendor/k8s.io/kubernetes/test/integration/volume/persistent_volumes_test.go

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

0 commit comments

Comments
 (0)