From 0a1579d0f2a9b01b08b3f502ead4d270fc2dc195 Mon Sep 17 00:00:00 2001 From: bells17 Date: Thu, 20 Feb 2020 01:00:22 +0900 Subject: [PATCH] Add support for list secret parameters to RemovePrefixedParameters --- pkg/sidecar-controller/snapshot_delete_test.go | 8 ++++++++ pkg/utils/util.go | 2 ++ 2 files changed, 10 insertions(+) diff --git a/pkg/sidecar-controller/snapshot_delete_test.go b/pkg/sidecar-controller/snapshot_delete_test.go index 85283f5e..01240892 100644 --- a/pkg/sidecar-controller/snapshot_delete_test.go +++ b/pkg/sidecar-controller/snapshot_delete_test.go @@ -61,6 +61,13 @@ var class5Parameters = map[string]string{ utils.AnnDeletionSecretRefNamespace: "default", } +var class6Parameters = map[string]string{ + "csi.storage.k8s.io/snapshotter-secret-name": "secret", + "csi.storage.k8s.io/snapshotter-secret-namespace": "default", + "csi.storage.k8s.io/snapshotter-list-secret-name": "secret", + "csi.storage.k8s.io/snapshotter-list-secret-namespace": "default", +} + var snapshotClasses = []*crdv1.VolumeSnapshotClass{ { TypeMeta: metav1.TypeMeta{ @@ -126,6 +133,7 @@ var snapshotClasses = []*crdv1.VolumeSnapshotClass{ Annotations: map[string]string{utils.IsDefaultSnapshotClassAnnotation: "true"}, }, Driver: mockDriverName, + Parameters: class6Parameters, DeletionPolicy: crdv1.VolumeSnapshotContentDelete, }, } diff --git a/pkg/utils/util.go b/pkg/utils/util.go index c2a155ab..b97a7383 100644 --- a/pkg/utils/util.go +++ b/pkg/utils/util.go @@ -368,6 +368,8 @@ func RemovePrefixedParameters(param map[string]string) (map[string]string, error switch k { case prefixedSnapshotterSecretNameKey: case prefixedSnapshotterSecretNamespaceKey: + case prefixedSnapshotterListSecretNameKey: + case prefixedSnapshotterListSecretNamespaceKey: default: return map[string]string{}, fmt.Errorf("found unknown parameter key \"%s\" with reserved namespace %s", k, csiParameterPrefix) }