Skip to content

Commit

Permalink
Merge pull request #57481 from wongma7/nfs-provisioner-v1.0.9
Browse files Browse the repository at this point in the history
Automatic merge from submit-queue (batch tested with PRs 57434, 57221, 57417, 57474, 57481). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Update nfsprovisioner image to v1.0.9 to fix annotation race with pv controller

fix #55780 . Summary: the provisioner must wait for the pv controller's annotation to be set as described by the 'protocol' doc, fail to wait and the pv controller may not be ready.

The relevant change to the image was kubernetes-retired/external-storage#521
```release-note
NONE
```
  • Loading branch information
Kubernetes Submit Queue authored Dec 21, 2017
2 parents 369b7a6 + 9247ff7 commit 3426843
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion test/e2e/storage/volume_provisioning.go
Original file line number Diff line number Diff line change
Expand Up @@ -914,7 +914,7 @@ func startExternalProvisioner(c clientset.Interface, ns string) *v1.Pod {
Containers: []v1.Container{
{
Name: "nfs-provisioner",
Image: "quay.io/kubernetes_incubator/nfs-provisioner:v1.0.6",
Image: "quay.io/kubernetes_incubator/nfs-provisioner:v1.0.9",
SecurityContext: &v1.SecurityContext{
Capabilities: &v1.Capabilities{
Add: []v1.Capability{"DAC_READ_SEARCH"},
Expand Down

0 comments on commit 3426843

Please sign in to comment.