alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for list secret parameters to RemovePrefixedParameters

Browse Source
This commit is contained in:
bells17
2020-02-20 01:00:22 +09:00
parent 2045ef16ba
commit 0a1579d0f2
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/sidecar-controller/snapshot_delete_test.go
View File

@@ -61,6 +61,13 @@ var class5Parameters = map[string]string{
utils.AnnDeletionSecretRefNamespace: "default", 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{ var snapshotClasses = []*crdv1.VolumeSnapshotClass{
{ {
TypeMeta: metav1.TypeMeta{ TypeMeta: metav1.TypeMeta{
@@ -126,6 +133,7 @@ var snapshotClasses = []*crdv1.VolumeSnapshotClass{
Annotations: map[string]string{utils.IsDefaultSnapshotClassAnnotation: "true"}, Annotations: map[string]string{utils.IsDefaultSnapshotClassAnnotation: "true"},
}, },
Driver: mockDriverName, Driver: mockDriverName,
Parameters: class6Parameters,
DeletionPolicy: crdv1.VolumeSnapshotContentDelete, DeletionPolicy: crdv1.VolumeSnapshotContentDelete,
}, },
} }

2
pkg/utils/util.go
View File

@@ -368,6 +368,8 @@ func RemovePrefixedParameters(param map[string]string) (map[string]string, error
switch k { switch k {
case prefixedSnapshotterSecretNameKey: case prefixedSnapshotterSecretNameKey:
case prefixedSnapshotterSecretNamespaceKey: case prefixedSnapshotterSecretNamespaceKey:
case prefixedSnapshotterListSecretNameKey:
case prefixedSnapshotterListSecretNamespaceKey:
default: default:
return map[string]string{}, fmt.Errorf("found unknown parameter key \"%s\" with reserved namespace %s", k, csiParameterPrefix) return map[string]string{}, fmt.Errorf("found unknown parameter key \"%s\" with reserved namespace %s", k, csiParameterPrefix)
} }