mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-08-17 12:46:05 +00:00
* refactor: use k8s.io/api well-known label constants Several well-known Kubernetes label strings were hardcoded across the codebase instead of using the constants already exported by k8s.io/api/core/v1, which is an existing dependency: "kubernetes.io/hostname" -> corev1api.LabelHostname "kubernetes.io/os" -> corev1api.LabelOSStable "topology.kubernetes.io/zone" -> corev1api.LabelTopologyZone The local kube.NodeOSLabel and zoneLabel consts, which duplicated the upstream values verbatim, are now defined in terms of the upstream constants rather than repeating the literal. Both are kept: NodeOSLabel is exported and referenced from four packages alongside NodeOSLinux and NodeOSWindows, which have no upstream equivalent, and zoneLabel sits beside the deprecated-label fallback it is compared against. No functional change - every replacement is a constant with an identical value. Signed-off-by: Harshit saini <harshitsaini1188@gmail.com> * Add changelog for #10279 Signed-off-by: Harshit saini <harshitsaini1188@gmail.com> * Cover the selected-node path in createRestorePod TestCreateRestorePod only exercised selectedNode == "", so the branch that pins the restore pod to a node was never executed. Add a case with a selected node and assert the resulting pod carries the hostname label in its node selector. Signed-off-by: Harshit saini <harshitsaini1188@gmail.com> * Also use constants for the arch and deprecated zone labels Extends the same replacement to the two remaining well-known labels raised on the issue: "kubernetes.io/arch" -> corev1api.LabelArchStable "failure-domain.beta.kubernetes.io/zone" -> corev1api.LabelFailureDomainBetaZone zoneLabelDeprecated in item_backupper.go was the last local const still repeating a literal that upstream already exports, so the zone pair now reads consistently against k8s.io/api. The deprecation note upstream applies to the label itself, not the constant; Velero reads that label deliberately as the fallback for PVs created before the topology labels existed. Signed-off-by: Harshit saini <harshitsaini1188@gmail.com> --------- Signed-off-by: Harshit saini <harshitsaini1188@gmail.com>
261 lines
6.7 KiB
Go
261 lines
6.7 KiB
Go
/*
|
|
Copyright 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 kube
|
|
|
|
import (
|
|
"testing"
|
|
|
|
"github.com/cockroachdb/errors"
|
|
"github.com/stretchr/testify/assert"
|
|
corev1api "k8s.io/api/core/v1"
|
|
"k8s.io/apimachinery/pkg/runtime"
|
|
|
|
"github.com/vmware-tanzu/velero/pkg/builder"
|
|
|
|
kubeClientFake "k8s.io/client-go/kubernetes/fake"
|
|
clientTesting "k8s.io/client-go/testing"
|
|
clientFake "sigs.k8s.io/controller-runtime/pkg/client/fake"
|
|
|
|
velerotest "github.com/vmware-tanzu/velero/pkg/test"
|
|
)
|
|
|
|
func TestIsLinuxNode(t *testing.T) {
|
|
nodeNoOSLabel := builder.ForNode("fake-node").Result()
|
|
nodeWindows := builder.ForNode("fake-node").Labels(map[string]string{corev1api.LabelOSStable: "windows"}).Result()
|
|
nodeLinux := builder.ForNode("fake-node").Labels(map[string]string{corev1api.LabelOSStable: "linux"}).Result()
|
|
|
|
scheme := runtime.NewScheme()
|
|
corev1api.AddToScheme(scheme)
|
|
|
|
tests := []struct {
|
|
name string
|
|
kubeClientObj []runtime.Object
|
|
err string
|
|
}{
|
|
{
|
|
name: "error getting node",
|
|
err: "error getting node fake-node: nodes \"fake-node\" not found",
|
|
},
|
|
{
|
|
name: "no os label",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeNoOSLabel,
|
|
},
|
|
err: "no os type label for node fake-node",
|
|
},
|
|
{
|
|
name: "os label does not match",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeWindows,
|
|
},
|
|
err: "os type windows for node fake-node is not linux",
|
|
},
|
|
{
|
|
name: "succeed",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeLinux,
|
|
},
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
fakeClientBuilder := clientFake.NewClientBuilder()
|
|
fakeClientBuilder = fakeClientBuilder.WithScheme(scheme)
|
|
|
|
fakeClient := fakeClientBuilder.WithRuntimeObjects(test.kubeClientObj...).Build()
|
|
|
|
err := IsLinuxNode(t.Context(), "fake-node", fakeClient)
|
|
if err != nil {
|
|
assert.EqualError(t, err, test.err)
|
|
} else {
|
|
assert.NoError(t, err)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestWithLinuxNode(t *testing.T) {
|
|
nodeWindows := builder.ForNode("fake-node-1").Labels(map[string]string{corev1api.LabelOSStable: "windows"}).Result()
|
|
nodeLinux := builder.ForNode("fake-node-2").Labels(map[string]string{corev1api.LabelOSStable: "linux"}).Result()
|
|
|
|
scheme := runtime.NewScheme()
|
|
corev1api.AddToScheme(scheme)
|
|
|
|
tests := []struct {
|
|
name string
|
|
kubeClientObj []runtime.Object
|
|
result bool
|
|
}{
|
|
{
|
|
name: "error listing node",
|
|
},
|
|
{
|
|
name: "with node of other type",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeWindows,
|
|
},
|
|
},
|
|
{
|
|
name: "with node of the same type",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeWindows,
|
|
nodeLinux,
|
|
},
|
|
result: true,
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
fakeClientBuilder := clientFake.NewClientBuilder()
|
|
fakeClientBuilder = fakeClientBuilder.WithScheme(scheme)
|
|
|
|
fakeClient := fakeClientBuilder.WithRuntimeObjects(test.kubeClientObj...).Build()
|
|
|
|
result := withOSNode(t.Context(), fakeClient, "linux", velerotest.NewLogger())
|
|
assert.Equal(t, test.result, result)
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestGetNodeOSType(t *testing.T) {
|
|
nodeNoOSLabel := builder.ForNode("fake-node").Result()
|
|
nodeWindows := builder.ForNode("fake-node").Labels(map[string]string{corev1api.LabelOSStable: "windows"}).Result()
|
|
nodeLinux := builder.ForNode("fake-node").Labels(map[string]string{corev1api.LabelOSStable: "linux"}).Result()
|
|
scheme := runtime.NewScheme()
|
|
corev1api.AddToScheme(scheme)
|
|
tests := []struct {
|
|
name string
|
|
kubeClientObj []runtime.Object
|
|
err string
|
|
expectedOSType string
|
|
}{
|
|
{
|
|
name: "error getting node",
|
|
err: "error getting node fake-node: nodes \"fake-node\" not found",
|
|
},
|
|
{
|
|
name: "no os label",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeNoOSLabel,
|
|
},
|
|
},
|
|
{
|
|
name: "windows node",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeWindows,
|
|
},
|
|
expectedOSType: "windows",
|
|
},
|
|
{
|
|
name: "linux node",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeLinux,
|
|
},
|
|
expectedOSType: "linux",
|
|
},
|
|
}
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
fakeKubeClient := kubeClientFake.NewSimpleClientset(test.kubeClientObj...)
|
|
osType, err := GetNodeOS(t.Context(), "fake-node", fakeKubeClient.CoreV1())
|
|
if err != nil {
|
|
assert.EqualError(t, err, test.err)
|
|
} else {
|
|
assert.Equal(t, test.expectedOSType, osType)
|
|
}
|
|
})
|
|
}
|
|
}
|
|
|
|
func TestHasNodeWithOS(t *testing.T) {
|
|
nodeNoOSLabel := builder.ForNode("fake-node-1").Result()
|
|
nodeWindows := builder.ForNode("fake-node-2").Labels(map[string]string{corev1api.LabelOSStable: "windows"}).Result()
|
|
nodeLinux := builder.ForNode("fake-node-3").Labels(map[string]string{corev1api.LabelOSStable: "linux"}).Result()
|
|
|
|
scheme := runtime.NewScheme()
|
|
corev1api.AddToScheme(scheme)
|
|
|
|
tests := []struct {
|
|
name string
|
|
kubeClientObj []runtime.Object
|
|
kubeReactors []reactor
|
|
os string
|
|
err string
|
|
}{
|
|
{
|
|
name: "os is empty",
|
|
err: "invalid node OS",
|
|
},
|
|
{
|
|
name: "error to list node",
|
|
kubeReactors: []reactor{
|
|
{
|
|
verb: "list",
|
|
resource: "nodes",
|
|
reactorFunc: func(action clientTesting.Action) (handled bool, ret runtime.Object, err error) {
|
|
return true, nil, errors.New("fake-list-error")
|
|
},
|
|
},
|
|
},
|
|
os: "linux",
|
|
err: "error listing nodes with OS linux: fake-list-error",
|
|
},
|
|
{
|
|
name: "no expected node - no node",
|
|
os: "linux",
|
|
err: "node with OS linux doesn't exist",
|
|
},
|
|
{
|
|
name: "no expected node - no node with label",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeNoOSLabel,
|
|
nodeWindows,
|
|
},
|
|
os: "linux",
|
|
err: "node with OS linux doesn't exist",
|
|
},
|
|
{
|
|
name: "succeed",
|
|
kubeClientObj: []runtime.Object{
|
|
nodeNoOSLabel,
|
|
nodeWindows,
|
|
nodeLinux,
|
|
},
|
|
os: "windows",
|
|
},
|
|
}
|
|
|
|
for _, test := range tests {
|
|
t.Run(test.name, func(t *testing.T) {
|
|
fakeKubeClient := kubeClientFake.NewSimpleClientset(test.kubeClientObj...)
|
|
|
|
for _, reactor := range test.kubeReactors {
|
|
fakeKubeClient.Fake.PrependReactor(reactor.verb, reactor.resource, reactor.reactorFunc)
|
|
}
|
|
|
|
err := HasNodeWithOS(t.Context(), test.os, fakeKubeClient.CoreV1())
|
|
if test.err != "" {
|
|
assert.EqualError(t, err, test.err)
|
|
} else {
|
|
assert.NoError(t, err)
|
|
}
|
|
})
|
|
}
|
|
}
|