Revert "added labels for namespace and pvc names for a pv"

This reverts commit b271302.

Author: sunnylovestiramisu

pkg/common/parameters.go

@@ -58,11 +58,6 @@ const (
 	tagKeyCreatedForSnapshotName        = "kubernetes.io/created-for/volumesnapshot/name"
 	tagKeyCreatedForSnapshotNamespace   = "kubernetes.io/created-for/volumesnapshot/namespace"
 	tagKeyCreatedForSnapshotContentName = "kubernetes.io/created-for/volumesnapshotcontent/name"
-
-	// Keys for labels to tag to PV
-	labelKeyCreatedForClaimNamespace = "kubernetes_io_created-for_pvc_namespace"
-	labelKeyCreatedForClaimName      = "kubernetes_io_created-for_pvc_name"
-	labelKeyCreatedForVolumeName     = "kubernetes_io_created-for_pv_name"
 )
 
 // DiskParameters contains normalized and defaulted disk parameters
@@ -133,15 +128,12 @@ func ExtractAndDefaultParameters(parameters map[string]string, driverName string
 		case ParameterKeyDiskEncryptionKmsKey:
 			// Resource names (e.g. "keyRings", "cryptoKeys", etc.) are case sensitive, so do not change case
 			p.DiskEncryptionKMSKey = v
-        case ParameterKeyPVCName:
-            p.Tags[tagKeyCreatedForClaimName] = v
-            p.Labels[labelKeyCreatedForClaimName] = v
-        case ParameterKeyPVCNamespace:
-            p.Tags[tagKeyCreatedForClaimNamespace] = v
-            p.Labels[labelKeyCreatedForClaimNamespace] = v
-        case ParameterKeyPVName:
-            p.Tags[tagKeyCreatedForVolumeName] = v
-            p.Labels[labelKeyCreatedForVolumeName] = v
+		case ParameterKeyPVCName:
+			p.Tags[tagKeyCreatedForClaimName] = v
+		case ParameterKeyPVCNamespace:
+			p.Tags[tagKeyCreatedForClaimNamespace] = v
+		case ParameterKeyPVName:
+			p.Tags[tagKeyCreatedForVolumeName] = v
 		case ParameterKeyLabels:
 			paramLabels, err := ConvertLabelsStringToMap(v)
 			if err != nil {

pkg/common/parameters_test.go

@@ -178,18 +178,6 @@ func TestExtractAndDefaultParameters(t *testing.T) {
 				Labels:               map[string]string{"key1": "value1", "label-1": "value-a", "label-2": "label-value-2"},
 			},
 		},
-        {
-            name:       "PVC labels",
-            parameters: map[string]string{ParameterKeyPVCName: "testPVCName", ParameterKeyPVCNamespace: "testPVCNamespace", ParameterKeyPVName: "testPVName"},
-            labels:     map[string]string{},
-            expectParams: DiskParameters{
-                DiskType:             "pd-standard",
-                ReplicationType:      "none",
-                DiskEncryptionKMSKey: "",
-                Tags:                 map[string]string{},
-                Labels:               map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"},
-            },
-        },
 	}
 
 	for _, tc := range tests {