Keep the annotation "pv.kubernetes.io/provisioned-by" when restoring PVs

More details please refer to vmware-tanzu#3470 (comment) Fixes vmware-tanzu#3470 Signed-off-by: Wenkai Yin(尹文开) <[email protected]>
ywk253100 · Nov 23, 2021 · 5406258 · 5406258
1 parent 48d1859
commit 5406258
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/changelogs/unreleased/4390-ywk253100 b/changelogs/unreleased/4390-ywk253100
@@ -0,0 +1 @@
+Keep the annotation "pv.kubernetes.io/provisioned-by" when storing PVs
diff --git a/pkg/restore/restore.go b/pkg/restore/restore.go
@@ -72,7 +72,6 @@ import (
 // Originals can be found in kubernetes/kubernetes/pkg/controller/volume/persistentvolume/util/util.go.
 const KubeAnnBindCompleted = "pv.kubernetes.io/bind-completed"
 const KubeAnnBoundByController = "pv.kubernetes.io/bound-by-controller"
-const KubeAnnDynamicallyProvisioned = "pv.kubernetes.io/provisioned-by"
 
 type VolumeSnapshotterGetter interface {
 	GetVolumeSnapshotter(name string) (velero.VolumeSnapshotter, error)
@@ -1576,10 +1575,6 @@ func resetVolumeBindingInfo(obj *unstructured.Unstructured) *unstructured.Unstru
 	// the PV(C) controller to take the two objects and bind them again.
 	delete(annotations, KubeAnnBoundByController)
 
-	// Remove the provisioned-by annotation which signals that the persistent
-	// volume was dynamically provisioned; it is now statically provisioned.
-	delete(annotations, KubeAnnDynamicallyProvisioned)
-
 	// GetAnnotations returns a copy, so we have to set them again.
 	obj.SetAnnotations(annotations)
 

diff --git a/pkg/restore/restore_test.go b/pkg/restore/restore_test.go
@@ -2989,15 +2989,15 @@ func Test_resetVolumeBindingInfo(t *testing.T) {
 				WithName("pv-1").WithAnnotations(
 				KubeAnnBindCompleted,
 				KubeAnnBoundByController,
-				KubeAnnDynamicallyProvisioned,
+				"pv.kubernetes.io/provisioned-by",
 			).WithSpecField("claimRef", map[string]interface{}{
 				"namespace":       "ns-1",
 				"name":            "pvc-1",
 				"uid":             "abc",
 				"resourceVersion": "1"}).Unstructured,
 			expected: NewTestUnstructured().WithMetadataField("kind", "persistentVolume").
 				WithName("pv-1").
-				WithAnnotations().
+				WithAnnotations("pv.kubernetes.io/provisioned-by").
 				WithSpecField("claimRef", map[string]interface{}{
 					"namespace": "ns-1", "name": "pvc-1"}).Unstructured,
 		},
@@ -3007,7 +3007,6 @@ func Test_resetVolumeBindingInfo(t *testing.T) {
 				WithName("pvc-1").WithAnnotations(
 				KubeAnnBindCompleted,
 				KubeAnnBoundByController,
-				KubeAnnDynamicallyProvisioned,
 			).WithSpecField("volumeName", "pv-1").Unstructured,
 			expected: NewTestUnstructured().WithMetadataField("kind", "persistentVolumeClaim").
 				WithName("pvc-1").WithAnnotations().
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Keep the annotation "pv.kubernetes.io/provisioned-by" when storing PVs