UPSTREAM: 59350: Do not recycle volumes that are used by pods

openshift · Feb 9, 2018 · fab7212 · fab7212
1 parent 073bb37
commit fab7212
Show file tree

Hide file tree

Showing 11 changed files with 135 additions and 7 deletions.
diff --git a/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go b/vendor/k8s.io/kubernetes/cmd/kube-controller-manager/app/core.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/BUILD b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/BUILD
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/binder_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/binder_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/delete_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/delete_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/framework_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/provision_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/provision_test.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_base.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/pv_controller_base.go
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/recycle_test.go b/vendor/k8s.io/kubernetes/pkg/controller/volume/persistentvolume/recycle_test.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/scheduler/volume_binding_test.go b/vendor/k8s.io/kubernetes/test/integration/scheduler/volume_binding_test.go
diff --git a/vendor/k8s.io/kubernetes/test/integration/volume/persistent_volumes_test.go b/vendor/k8s.io/kubernetes/test/integration/volume/persistent_volumes_test.go