Revert "ignore some pvc annotations"

This reverts commit 9ba69dd.

Author: Wei Weng

pkg/controllers/placement/resource_selector.go

@@ -30,7 +30,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
-	pvutil "k8s.io/component-helpers/storage/volume"
 	"k8s.io/klog/v2"
 	"k8s.io/kubectl/pkg/util/deployment"
 	"sigs.k8s.io/controller-runtime/pkg/client"
@@ -445,15 +444,6 @@ func generateRawContent(object *unstructured.Unstructured) ([]byte, error) {
 		delete(annots, corev1.LastAppliedConfigAnnotation)
 		// Remove the revision annotation set by deployment controller.
 		delete(annots, deployment.RevisionAnnotation)
-		// Remove node-specific annotations from PVCs that would break when propagated to member clusters
-		// These annotations reference specific nodes from the hub cluster which don't exist on member clusters
-		// The member cluster's storage provisioner will set appropriate values for its own nodes
-		// All annotations below are listed in well-known labels, annotations and taints document:
-		// https://kubernetes.io/docs/reference/labels-annotations-taints/
-		delete(annots, pvutil.AnnSelectedNode)           // Node selected for volume binding
-		delete(annots, pvutil.AnnBindCompleted)          // Binding completion status
-		delete(annots, pvutil.AnnBoundByController)      // Controller binding status
-		delete(annots, pvutil.AnnBetaStorageProvisioner) // Beta storage provisioner annotation
 		if len(annots) == 0 {
 			object.SetAnnotations(nil)
 		} else {

pkg/controllers/placement/resource_selector_test.go

@@ -27,14 +27,12 @@ import (
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/api/meta"
-	"k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/types"
 	utilrand "k8s.io/apimachinery/pkg/util/rand"
-	pvutil "k8s.io/component-helpers/storage/volume"
 	"k8s.io/kubectl/pkg/util/deployment"
 	"k8s.io/utils/ptr"
 
@@ -245,60 +243,6 @@ func TestGenerateResourceContent(t *testing.T) {
 				},
 			},
 		},
-		"PersistentVolumeClaim with node-specific annotations": {
-			resource: corev1.PersistentVolumeClaim{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: "v1",
-					Kind:       "PersistentVolumeClaim",
-				},
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-pvc",
-					Namespace: "test-namespace",
-					Annotations: map[string]string{
-						pvutil.AnnSelectedNode:           "hub-control-plane",
-						pvutil.AnnBindCompleted:          "yes",
-						pvutil.AnnBoundByController:      "yes",
-						pvutil.AnnBetaStorageProvisioner: "kubernetes.io/no-provisioner",
-						"custom-annotation":              "should-remain",
-					},
-				},
-				Spec: corev1.PersistentVolumeClaimSpec{
-					AccessModes: []corev1.PersistentVolumeAccessMode{
-						corev1.ReadWriteOnce,
-					},
-					Resources: corev1.VolumeResourceRequirements{
-						Requests: corev1.ResourceList{
-							corev1.ResourceStorage: resource.MustParse("1Gi"),
-						},
-					},
-					StorageClassName: ptr.To("standard"),
-				},
-			},
-			wantResource: corev1.PersistentVolumeClaim{
-				TypeMeta: metav1.TypeMeta{
-					APIVersion: "v1",
-					Kind:       "PersistentVolumeClaim",
-				},
-				ObjectMeta: metav1.ObjectMeta{
-					Name:      "test-pvc",
-					Namespace: "test-namespace",
-					Annotations: map[string]string{
-						"custom-annotation": "should-remain",
-					},
-				},
-				Spec: corev1.PersistentVolumeClaimSpec{
-					AccessModes: []corev1.PersistentVolumeAccessMode{
-						corev1.ReadWriteOnce,
-					},
-					Resources: corev1.VolumeResourceRequirements{
-						Requests: corev1.ResourceList{
-							corev1.ResourceStorage: resource.MustParse("1Gi"),
-						},
-					},
-					StorageClassName: ptr.To("standard"),
-				},
-			},
-		},
 	}
 
 	for testName, tt := range tests {