2020-04-03 15:01:34 +00:00
|
|
|
/*
|
|
|
|
Copyright 2020 the Velero contributors.
|
|
|
|
|
|
|
|
Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
you may not use this file except in compliance with the License.
|
|
|
|
You may obtain a copy of the License at
|
|
|
|
|
|
|
|
http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
|
|
|
|
Unless required by applicable law or agreed to in writing, software
|
|
|
|
distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
See the License for the specific language governing permissions and
|
|
|
|
limitations under the License.
|
|
|
|
*/
|
|
|
|
|
|
|
|
package restore
|
|
|
|
|
|
|
|
import (
|
2023-02-06 09:03:35 +00:00
|
|
|
"bytes"
|
k8s 1.18 import (#2651)
* k8s 1.18 import wip
backup, cmd, controller, generated, restic, restore, serverstatusrequest, test and util
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go mod tidy
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* add changelog file
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go fmt
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* update code-generator and controller-gen in CI
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* checkout proper code-generator version, regen
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix remaining calls
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* regenerate CRDs with ./hack/update-generated-crd-code.sh
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use existing context in restic and server
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix test cases by resetting resource version
also use main library go context, not golang.org/x/net/context, in pkg/restore/restore.go
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* clarify changelog message
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use github.com/kubernetes-csi/external-snapshotter/v2@v2.2.0-rc1
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* run 'go mod tidy' to remove old external-snapshotter version
Signed-off-by: Andrew Lavery <laverya@umich.edu>
2020-07-16 16:21:37 +00:00
|
|
|
"context"
|
2020-04-03 15:01:34 +00:00
|
|
|
"fmt"
|
2023-02-06 09:03:35 +00:00
|
|
|
"strings"
|
2020-04-03 15:01:34 +00:00
|
|
|
"testing"
|
|
|
|
|
|
|
|
"github.com/sirupsen/logrus"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
|
|
"github.com/stretchr/testify/require"
|
|
|
|
corev1api "k8s.io/api/core/v1"
|
k8s 1.18 import (#2651)
* k8s 1.18 import wip
backup, cmd, controller, generated, restic, restore, serverstatusrequest, test and util
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go mod tidy
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* add changelog file
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go fmt
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* update code-generator and controller-gen in CI
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* checkout proper code-generator version, regen
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix remaining calls
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* regenerate CRDs with ./hack/update-generated-crd-code.sh
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use existing context in restic and server
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix test cases by resetting resource version
also use main library go context, not golang.org/x/net/context, in pkg/restore/restore.go
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* clarify changelog message
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use github.com/kubernetes-csi/external-snapshotter/v2@v2.2.0-rc1
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* run 'go mod tidy' to remove old external-snapshotter version
Signed-off-by: Andrew Lavery <laverya@umich.edu>
2020-07-16 16:21:37 +00:00
|
|
|
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
|
2020-04-03 15:01:34 +00:00
|
|
|
"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
|
|
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
|
|
"k8s.io/client-go/kubernetes/fake"
|
|
|
|
|
|
|
|
"github.com/vmware-tanzu/velero/pkg/builder"
|
2022-10-12 16:41:50 +00:00
|
|
|
"github.com/vmware-tanzu/velero/pkg/plugin/velero"
|
2020-04-03 15:01:34 +00:00
|
|
|
)
|
|
|
|
|
|
|
|
// TestChangePVCNodeSelectorActionExecute runs the ChangePVCNodeSelectorAction's Execute
|
|
|
|
// method and validates that the item's PVC is modified (or not) as expected.
|
|
|
|
// Validation is done by comparing the result of the Execute method to the test case's
|
|
|
|
// desired result.
|
|
|
|
func TestChangePVCNodeSelectorActionExecute(t *testing.T) {
|
|
|
|
tests := []struct {
|
|
|
|
name string
|
|
|
|
pvc *corev1api.PersistentVolumeClaim
|
|
|
|
configMap *corev1api.ConfigMap
|
|
|
|
node *corev1api.Node
|
2023-02-06 09:03:35 +00:00
|
|
|
newNode *corev1api.Node
|
2020-04-03 15:01:34 +00:00
|
|
|
want *corev1api.PersistentVolumeClaim
|
|
|
|
wantErr error
|
|
|
|
}{
|
|
|
|
{
|
|
|
|
name: "a valid mapping for a persistent volume claim is applied correctly",
|
|
|
|
pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
configMap: builder.ForConfigMap("velero", "change-pvc-node").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/change-pvc-node-selector", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Data("source-node", "dest-node").
|
|
|
|
Result(),
|
2023-02-06 09:03:35 +00:00
|
|
|
newNode: builder.ForNode("dest-node").Result(),
|
2020-04-03 15:01:34 +00:00
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "dest-node"),
|
|
|
|
).Result(),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "when no config map exists for the plugin and node doesn't exist, the item is returned without node selector",
|
|
|
|
pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
configMap: builder.ForConfigMap("velero", "change-pvc-node").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/some-other-plugin", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Data("source-noed", "dest-node").
|
|
|
|
Result(),
|
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "when no node-mappings exist in the plugin config map and selected-node doesn't exist, the item is returned without node selector",
|
|
|
|
pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
configMap: builder.ForConfigMap("velero", "change-pvc-node").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/change-pvc-node-selector", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Result(),
|
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "when no node-mappings exist in the plugin config map and selected-node exist, the item is returned as-is",
|
|
|
|
pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
configMap: builder.ForConfigMap("velero", "change-pvc-node").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/change-pvc-node-selector", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Result(),
|
|
|
|
// MAYANK TODO
|
|
|
|
node: builder.ForNode("source-node").Result(),
|
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
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").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/change-pvc-node-selector", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Data("source-node", "dest-node").
|
|
|
|
Result(),
|
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(),
|
|
|
|
},
|
|
|
|
{
|
|
|
|
name: "when persistent volume claim's node-selector has no mapping in the config map, the item is returned without node selector",
|
|
|
|
pvc: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").
|
|
|
|
ObjectMeta(
|
|
|
|
builder.WithAnnotations("volume.kubernetes.io/selected-node", "source-node"),
|
|
|
|
).Result(),
|
|
|
|
configMap: builder.ForConfigMap("velero", "change-pvc-node").
|
2023-05-15 01:51:52 +00:00
|
|
|
ObjectMeta(builder.WithLabels("velero.io/plugin-config", "", "velero.io/change-pvc-node-selector", "RestoreItemAction")).
|
2020-04-03 15:01:34 +00:00
|
|
|
Data("source-node-1", "dest-node").
|
|
|
|
Result(),
|
|
|
|
want: builder.ForPersistentVolumeClaim("source-ns", "pvc-1").Result(),
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
for _, tc := range tests {
|
|
|
|
t.Run(tc.name, func(t *testing.T) {
|
|
|
|
clientset := fake.NewSimpleClientset()
|
2023-02-06 09:03:35 +00:00
|
|
|
logger := logrus.StandardLogger()
|
|
|
|
buf := bytes.Buffer{}
|
|
|
|
logrus.SetOutput(&buf)
|
2020-04-03 15:01:34 +00:00
|
|
|
a := NewChangePVCNodeSelectorAction(
|
2023-02-06 09:03:35 +00:00
|
|
|
logger,
|
2020-04-03 15:01:34 +00:00
|
|
|
clientset.CoreV1().ConfigMaps("velero"),
|
|
|
|
clientset.CoreV1().Nodes(),
|
|
|
|
)
|
|
|
|
|
|
|
|
// set up test data
|
|
|
|
if tc.configMap != nil {
|
k8s 1.18 import (#2651)
* k8s 1.18 import wip
backup, cmd, controller, generated, restic, restore, serverstatusrequest, test and util
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go mod tidy
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* add changelog file
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go fmt
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* update code-generator and controller-gen in CI
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* checkout proper code-generator version, regen
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix remaining calls
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* regenerate CRDs with ./hack/update-generated-crd-code.sh
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use existing context in restic and server
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix test cases by resetting resource version
also use main library go context, not golang.org/x/net/context, in pkg/restore/restore.go
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* clarify changelog message
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use github.com/kubernetes-csi/external-snapshotter/v2@v2.2.0-rc1
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* run 'go mod tidy' to remove old external-snapshotter version
Signed-off-by: Andrew Lavery <laverya@umich.edu>
2020-07-16 16:21:37 +00:00
|
|
|
_, err := clientset.CoreV1().ConfigMaps(tc.configMap.Namespace).Create(context.TODO(), tc.configMap, metav1.CreateOptions{})
|
2020-04-03 15:01:34 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
|
|
|
|
|
|
|
if tc.node != nil {
|
k8s 1.18 import (#2651)
* k8s 1.18 import wip
backup, cmd, controller, generated, restic, restore, serverstatusrequest, test and util
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go mod tidy
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* add changelog file
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* go fmt
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* update code-generator and controller-gen in CI
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* checkout proper code-generator version, regen
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix remaining calls
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* regenerate CRDs with ./hack/update-generated-crd-code.sh
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use existing context in restic and server
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* fix test cases by resetting resource version
also use main library go context, not golang.org/x/net/context, in pkg/restore/restore.go
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* clarify changelog message
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* use github.com/kubernetes-csi/external-snapshotter/v2@v2.2.0-rc1
Signed-off-by: Andrew Lavery <laverya@umich.edu>
* run 'go mod tidy' to remove old external-snapshotter version
Signed-off-by: Andrew Lavery <laverya@umich.edu>
2020-07-16 16:21:37 +00:00
|
|
|
_, err := clientset.CoreV1().Nodes().Create(context.TODO(), tc.node, metav1.CreateOptions{})
|
2020-04-03 15:01:34 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
2023-02-06 09:03:35 +00:00
|
|
|
if tc.newNode != nil {
|
|
|
|
_, err := clientset.CoreV1().Nodes().Create(context.TODO(), tc.newNode, metav1.CreateOptions{})
|
|
|
|
require.NoError(t, err)
|
|
|
|
}
|
2020-04-03 15:01:34 +00:00
|
|
|
unstructuredMap, err := runtime.DefaultUnstructuredConverter.ToUnstructured(tc.pvc)
|
|
|
|
require.NoError(t, err)
|
|
|
|
|
2022-10-12 16:41:50 +00:00
|
|
|
input := &velero.RestoreItemActionExecuteInput{
|
2020-04-03 15:01:34 +00:00
|
|
|
Item: &unstructured.Unstructured{
|
|
|
|
Object: unstructuredMap,
|
|
|
|
},
|
|
|
|
}
|
|
|
|
|
|
|
|
// execute method under test
|
|
|
|
res, err := a.Execute(input)
|
|
|
|
|
2023-02-06 09:03:35 +00:00
|
|
|
// Make sure mapped selected-node exists.
|
2023-04-25 05:50:52 +00:00
|
|
|
logOutput := buf.String()
|
|
|
|
assert.Equal(t, strings.Contains(logOutput, "Selected-node's mapped node doesn't exist"), false)
|
2023-02-06 09:03:35 +00:00
|
|
|
|
2020-04-03 15:01:34 +00:00
|
|
|
// validate for both error and non-error cases
|
|
|
|
switch {
|
|
|
|
case tc.wantErr != nil:
|
|
|
|
assert.EqualError(t, err, tc.wantErr.Error())
|
|
|
|
default:
|
|
|
|
fmt.Printf("got +%v\n", res.UpdatedItem)
|
|
|
|
assert.NoError(t, err)
|
|
|
|
|
|
|
|
wantUnstructured, err := runtime.DefaultUnstructuredConverter.ToUnstructured(tc.want)
|
Fix various typos found by codespell (#3057)
By running the following command:
codespell -S .git,*.png,*.jpg,*.woff,*.ttf,*.gif,*.ico -L \
iam,aks,ist,bridget,ue
Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
2020-11-10 16:48:35 +00:00
|
|
|
fmt.Printf("expected +%v\n", wantUnstructured)
|
2020-04-03 15:01:34 +00:00
|
|
|
require.NoError(t, err)
|
|
|
|
|
|
|
|
assert.Equal(t, &unstructured.Unstructured{Object: wantUnstructured}, res.UpdatedItem)
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|