From 50fc85e3c78d59580f7abcac8fd2553c45c122e1 Mon Sep 17 00:00:00 2001 From: Sunny Song Date: Fri, 17 Mar 2023 18:27:26 +0000 Subject: [PATCH 1/2] Revert "updated test cases" This reverts commit 9f0256326e787f9b3c317c5c5795488e80d6951a. --- pkg/common/parameters.go | 18 ++++++++--------- pkg/common/parameters_test.go | 38 ++++++++++++----------------------- 2 files changed, 22 insertions(+), 34 deletions(-) diff --git a/pkg/common/parameters.go b/pkg/common/parameters.go index 411b28abd..69be5422f 100644 --- a/pkg/common/parameters.go +++ b/pkg/common/parameters.go @@ -133,15 +133,15 @@ 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 + 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 ParameterKeyLabels: paramLabels, err := ConvertLabelsStringToMap(v) if err != nil { diff --git a/pkg/common/parameters_test.go b/pkg/common/parameters_test.go index eb4023845..e37e591bf 100644 --- a/pkg/common/parameters_test.go +++ b/pkg/common/parameters_test.go @@ -139,7 +139,7 @@ func TestExtractAndDefaultParameters(t *testing.T) { ReplicationType: "none", DiskEncryptionKMSKey: "", Tags: map[string]string{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"}, - Labels: map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"}, + Labels: map[string]string{}, }, }, { @@ -178,30 +178,18 @@ 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{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"}, - Labels: map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"}, - }, - }, - { - name: "PVC labels-override", - parameters: map[string]string{ParameterKeyPVCName: "testPVCName", ParameterKeyPVCNamespace: "testPVCNamespace", ParameterKeyPVName: "testPVName"}, - labels: map[string]string{labelKeyCreatedForClaimNamespace: "test-override"}, - expectParams: DiskParameters{ - DiskType: "pd-standard", - ReplicationType: "none", - DiskEncryptionKMSKey: "", - Tags: map[string]string{tagKeyCreatedForClaimName: "testPVCName", tagKeyCreatedForClaimNamespace: "testPVCNamespace", tagKeyCreatedForVolumeName: "testPVName", tagKeyCreatedBy: "testDriver"}, - Labels: map[string]string{labelKeyCreatedForClaimName: "testPVCName", labelKeyCreatedForClaimNamespace: "testPVCNamespace", labelKeyCreatedForVolumeName: "testPVName"}, - }, - }, + { + 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 { From 336e2eca17ca66e916638c35df7e8afe3106adb1 Mon Sep 17 00:00:00 2001 From: Sunny Song Date: Fri, 17 Mar 2023 18:27:47 +0000 Subject: [PATCH 2/2] Revert "added labels for namespace and pvc names for a pv" This reverts commit b271302fa27d797ecfc9bc339ca7c213d1e4ace4. --- pkg/common/parameters.go | 20 ++++++-------------- pkg/common/parameters_test.go | 12 ------------ 2 files changed, 6 insertions(+), 26 deletions(-) diff --git a/pkg/common/parameters.go b/pkg/common/parameters.go index 69be5422f..e7f0104dc 100644 --- a/pkg/common/parameters.go +++ b/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 { diff --git a/pkg/common/parameters_test.go b/pkg/common/parameters_test.go index e37e591bf..2d1a4b6b0 100644 --- a/pkg/common/parameters_test.go +++ b/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 {