Merge pull request #18856 from jsafrane/aws-idempotent

UPSTREAM: 60490: Volume deletion should be idempotent
openshift · Mar 8, 2018 · 89f7b03 · 89f7b03
2 parents 746e4d3 + 9420735
commit 89f7b03
Show file tree

Hide file tree

Showing 3 changed files with 119 additions and 10 deletions.
diff --git a/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go b/vendor/k8s.io/kubernetes/pkg/cloudprovider/providers/aws/aws.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/pv_util.go b/vendor/k8s.io/kubernetes/test/e2e/framework/pv_util.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/storage/volume_provisioning.go b/vendor/k8s.io/kubernetes/test/e2e/storage/volume_provisioning.go