Skip to content

Commit 0a1579d

Browse files
committed
Add support for list secret parameters to RemovePrefixedParameters
1 parent 2045ef1 commit 0a1579d

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

pkg/sidecar-controller/snapshot_delete_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,13 @@ var class5Parameters = map[string]string{
6161
utils.AnnDeletionSecretRefNamespace: "default",
6262
}
6363

64+
var class6Parameters = map[string]string{
65+
"csi.storage.k8s.io/snapshotter-secret-name": "secret",
66+
"csi.storage.k8s.io/snapshotter-secret-namespace": "default",
67+
"csi.storage.k8s.io/snapshotter-list-secret-name": "secret",
68+
"csi.storage.k8s.io/snapshotter-list-secret-namespace": "default",
69+
}
70+
6471
var snapshotClasses = []*crdv1.VolumeSnapshotClass{
6572
{
6673
TypeMeta: metav1.TypeMeta{
@@ -126,6 +133,7 @@ var snapshotClasses = []*crdv1.VolumeSnapshotClass{
126133
Annotations: map[string]string{utils.IsDefaultSnapshotClassAnnotation: "true"},
127134
},
128135
Driver: mockDriverName,
136+
Parameters: class6Parameters,
129137
DeletionPolicy: crdv1.VolumeSnapshotContentDelete,
130138
},
131139
}

pkg/utils/util.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -368,6 +368,8 @@ func RemovePrefixedParameters(param map[string]string) (map[string]string, error
368368
switch k {
369369
case prefixedSnapshotterSecretNameKey:
370370
case prefixedSnapshotterSecretNamespaceKey:
371+
case prefixedSnapshotterListSecretNameKey:
372+
case prefixedSnapshotterListSecretNamespaceKey:
371373
default:
372374
return map[string]string{}, fmt.Errorf("found unknown parameter key \"%s\" with reserved namespace %s", k, csiParameterPrefix)
373375
}

0 commit comments

Comments
 (0)