diff --git a/changelogs/unreleased/2970-mynktl b/changelogs/unreleased/2970-mynktl new file mode 100644 index 000000000..8d54ec6ac --- /dev/null +++ b/changelogs/unreleased/2970-mynktl @@ -0,0 +1 @@ +Fixed 'velero.io/change-pvc-node-selector' plugin to fetch configmap using label key "velero.io/change-pvc-node-selector" diff --git a/pkg/restore/change_pvc_node_selector.go b/pkg/restore/change_pvc_node_selector.go index 0b1db0478..b4d947c21 100644 --- a/pkg/restore/change_pvc_node_selector.go +++ b/pkg/restore/change_pvc_node_selector.go @@ -130,7 +130,7 @@ func (p *ChangePVCNodeSelectorAction) Execute(input *velero.RestoreItemActionExe func getNewNodeFromConfigMap(client corev1client.ConfigMapInterface, node string) (string, error) { // fetch node mapping from configMap - config, err := getPluginConfig(framework.PluginKindRestoreItemAction, "velero.io/change-pvc-node", client) + config, err := getPluginConfig(framework.PluginKindRestoreItemAction, "velero.io/change-pvc-node-selector", client) if err != nil { return "", err } diff --git a/pkg/restore/change_pvc_node_selector_test.go b/pkg/restore/change_pvc_node_selector_test.go index c97e9b410..0bbf206d6 100644 --- a/pkg/restore/change_pvc_node_selector_test.go +++ b/pkg/restore/change_pvc_node_selector_test.go @@ -54,7 +54,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) { builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"), ).Result(), configMap: builder.ForConfigMap("velero", "change-pvc-node"). - ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node", "RestoreItemAction")). + ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node-selector", "RestoreItemAction")). Data("source-node", "dest-node"). Result(), want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1"). @@ -81,7 +81,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) { builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"), ).Result(), configMap: builder.ForConfigMap("velero", "change-pvc-node"). - ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node", "RestoreItemAction")). + ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node-selector", "RestoreItemAction")). Result(), want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(), }, @@ -92,7 +92,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) { builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"), ).Result(), configMap: builder.ForConfigMap("velero", "change-pvc-node"). - ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node", "RestoreItemAction")). + ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node-selector", "RestoreItemAction")). Result(), // MAYANK TODO node: builder.ForNode("source-node").Result(), @@ -105,7 +105,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) { name: "when persistent volume claim has no node selector, the item is returned as-is", pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(), configMap: builder.ForConfigMap("velero", "change-pvc-node"). - ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node", "RestoreItemAction")). + ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node-selector", "RestoreItemAction")). Data("source-node", "dest-node"). Result(), want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(), @@ -117,7 +117,7 @@ func TestChangePVCNodeSelectorActionExecute(t *testing.T) { builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"), ).Result(), configMap: builder.ForConfigMap("velero", "change-pvc-node"). - ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node", "RestoreItemAction")). + ObjectMeta(builder.WithLabels("velero.io/plugin-config", "true", "velero.io/change-pvc-node-selector", "RestoreItemAction")). Data("source-node-1", "dest-node"). Result(), want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(),