Merge pull request #43555 from NickrenREN/pv-setClaimProvisioner

Automatic merge from submit-queue Fix PVC Annotations annDynamicallyProvisioned is added to PV, while PVC has annStorageProvisioner. **Release note**: ```release-note NONE ```

Merge pull request #43555 from NickrenREN/pv-setClaimProvisioner
2169beed · Kubernetes Submit Queue · GitHub · a7788aff · 5d1c7c77 · 2169beed
Commit 2169beed authored Mar 26, 2017 by Kubernetes Submit Queue Committed by GitHub Mar 26, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

pv_controller_base.go pkg/controller/volume/persistentvolume/pv_controller_base.go +1 -1

No files found.
--- a/pkg/controller/volume/persistentvolume/pv_controller_base.go
+++ b/pkg/controller/volume/persistentvolume/pv_controller_base.go
@@ -449,7 +449,7 @@ func (ctrl *PersistentVolumeController) upgradeVolumeFrom1_2(volume *v1.Persiste
 // setClaimProvisioner saves
 // claim.Annotations[annStorageProvisioner] = class.Provisioner
 func (ctrl *PersistentVolumeController) setClaimProvisioner(claim *v1.PersistentVolumeClaim, class *storage.StorageClass) (*v1.PersistentVolumeClaim, error) {
-	if val, ok := claim.Annotations[annDynamicallyProvisioned]; ok && val == class.Provisioner {
+	if val, ok := claim.Annotations[annStorageProvisioner]; ok && val == class.Provisioner {
 		// annotation is already set, nothing to do
 		return claim, nil
 	}