Merge pull request #20072 from jsafrane/aws-key-checks

UPSTREAM: 65223: Fixed detection of inaccessible AWS encryption key
openshift · Jun 25, 2018 · 4536fa1 · 4536fa1
2 parents d5a5312 + 31a5def
commit 4536fa1
Show file tree

Hide file tree

Showing 2 changed files with 93 additions and 21 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/storage/volume_provisioning.go b/vendor/k8s.io/kubernetes/test/e2e/storage/volume_provisioning.go