mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-01-03 11:45:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix PluginConfigLabelSelector bugs

Browse Source 
Signed-off-by: Ming <mqiu@vmware.com>
This commit is contained in:
Ming
2023-05-15 01:51:52 +00:00
parent 12a14d11e9
commit f03e73bfc2
5 changed files with 35 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/plugin/framework/common/plugin_config.go
View File

@@ -27,7 +27,7 @@ import (
)
func PluginConfigLabelSelector(kind PluginKind, name string) string {
return fmt.Sprintf("velero.io/plugin-config=true,%s=%s", name, kind)
return fmt.Sprintf("velero.io/plugin-config,%s=%s", name, kind)
}
func GetPluginConfig(kind PluginKind, name string, client corev1client.ConfigMapInterface) (*corev1.ConfigMap, error) {

9
pkg/plugin/framework/common/plugin_config_test.go
View File

@@ -22,7 +22,6 @@ import (
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/client-go/kubernetes/fake"
@@ -35,7 +34,7 @@ func TestGetPluginConfig(t *testing.T) {
name string
objects []runtime.Object
}
pluginLabelsSet, _ := labels.ConvertSelectorToLabelsMap(PluginConfigLabelSelector(PluginKindRestoreItemAction, "foo"))
pluginLabelsMap := map[string]string{"velero.io/plugin-config": "", "foo": "RestoreItemAction"}
testConfigMap := &corev1.ConfigMap{
TypeMeta: metav1.TypeMeta{
Kind: "ConfigMap",
@@ -43,7 +42,7 @@ func TestGetPluginConfig(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "foo-config",
Namespace: velerov1.DefaultNamespace,
Labels: pluginLabelsSet,
Labels: pluginLabelsMap,
},
}
tests := []struct {
@@ -75,7 +74,7 @@ func TestGetPluginConfig(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "foo-config",
Namespace: velerov1.DefaultNamespace,
Labels: pluginLabelsSet,
Labels: pluginLabelsMap,
},
},
&corev1.ConfigMap{
@@ -85,7 +84,7 @@ func TestGetPluginConfig(t *testing.T) {
ObjectMeta: metav1.ObjectMeta{
Name: "foo-config-duplicate",
Namespace: velerov1.DefaultNamespace,
Labels: pluginLabelsSet,
Labels: pluginLabelsMap,
},
},
},