From ca9f52293cad063e9e4ad800643b7ce356ffab0a Mon Sep 17 00:00:00 2001 From: Vasiliy Ulyanov Date: Tue, 19 Mar 2024 09:10:46 +0100 Subject: [PATCH] tests: Use GetUtilityImageFromRegistry() function Signed-off-by: Vasiliy Ulyanov --- tests/libpod/BUILD.bazel | 2 +- tests/libpod/render.go | 10 ++++------ tests/libstorage/pvc.go | 3 +-- tests/storage/hotplug.go | 5 ++--- tests/sysprep_test.go | 3 +-- tests/vmi_cloudinit_hook_sidecar_test.go | 5 ++--- tests/vmi_hook_sidecar_test.go | 9 ++++----- 7 files changed, 15 insertions(+), 22 deletions(-) diff --git a/tests/libpod/BUILD.bazel b/tests/libpod/BUILD.bazel index 80c4e88d40b7..df248bb7d356 100644 --- a/tests/libpod/BUILD.bazel +++ b/tests/libpod/BUILD.bazel @@ -15,9 +15,9 @@ go_library( "//pkg/pointer:go_default_library", "//staging/src/kubevirt.io/api/core/v1:go_default_library", "//tests/exec:go_default_library", - "//tests/flags:go_default_library", "//tests/framework/kubevirt:go_default_library", "//tests/testsuite:go_default_library", + "//tests/util:go_default_library", "//vendor/github.com/onsi/gomega:go_default_library", "//vendor/k8s.io/api/core/v1:go_default_library", "//vendor/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library", diff --git a/tests/libpod/render.go b/tests/libpod/render.go index 2dd98a190461..a244a94718b1 100644 --- a/tests/libpod/render.go +++ b/tests/libpod/render.go @@ -20,8 +20,6 @@ package libpod import ( - "fmt" - v1 "k8s.io/api/core/v1" v12 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -29,8 +27,8 @@ import ( "kubevirt.io/kubevirt/pkg/pointer" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/testsuite" + "kubevirt.io/kubevirt/tests/util" ) func RenderPrivilegedPod(name string, cmd []string, args []string) *v1.Pod { @@ -42,7 +40,7 @@ func RenderPrivilegedPod(name string, cmd []string, args []string) *v1.Pod { } pod.Spec.Containers = []v1.Container{ renderPrivilegedContainerSpec( - fmt.Sprintf("%s/vm-killer:%s", flags.KubeVirtUtilityRepoPrefix, flags.KubeVirtUtilityVersionTag), + util.GetUtilityImageFromRegistry("vm-killer"), name, cmd, args), @@ -63,7 +61,7 @@ func RenderPod(name string, cmd []string, args []string) *v1.Pod { RestartPolicy: v1.RestartPolicyNever, Containers: []v1.Container{ renderContainerSpec( - fmt.Sprintf("%s/vm-killer:%s", flags.KubeVirtUtilityRepoPrefix, flags.KubeVirtUtilityVersionTag), + util.GetUtilityImageFromRegistry("vm-killer"), name, cmd, args), @@ -137,7 +135,7 @@ func RenderTargetcliPod(name, disksPVC string) *v1.Pod { ) hostPathDirectory := v1.HostPathDirectory targetcliContainer := renderPrivilegedContainerSpec( - fmt.Sprintf("%s/vm-killer:%s", flags.KubeVirtUtilityRepoPrefix, flags.KubeVirtUtilityVersionTag), + util.GetUtilityImageFromRegistry("vm-killer"), "targetcli", []string{"tail", "-f", "/dev/null"}, []string{}) targetcliContainer.VolumeMounts = []v1.VolumeMount{ { diff --git a/tests/libstorage/pvc.go b/tests/libstorage/pvc.go index b9157eac19f6..36cc24344b6b 100644 --- a/tests/libstorage/pvc.go +++ b/tests/libstorage/pvc.go @@ -39,7 +39,6 @@ import ( v1 "kubevirt.io/api/core/v1" "kubevirt.io/kubevirt/pkg/util/net/ip" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/framework/cleanup" "kubevirt.io/kubevirt/tests/libnode" "kubevirt.io/kubevirt/tests/util" @@ -68,7 +67,7 @@ func RenderPodWithPVC(name string, cmd []string, args []string, pvc *k8sv1.Persi Containers: []k8sv1.Container{ { Name: name, - Image: fmt.Sprintf("%s/vm-killer:%s", flags.KubeVirtUtilityRepoPrefix, flags.KubeVirtUtilityVersionTag), + Image: util.GetUtilityImageFromRegistry("vm-killer"), Command: cmd, Args: args, SecurityContext: &k8sv1.SecurityContext{ diff --git a/tests/storage/hotplug.go b/tests/storage/hotplug.go index e0bf44d4b4a9..9bcbc804d1b4 100644 --- a/tests/storage/hotplug.go +++ b/tests/storage/hotplug.go @@ -59,7 +59,6 @@ import ( "kubevirt.io/kubevirt/tests/clientcmd" "kubevirt.io/kubevirt/tests/console" cd "kubevirt.io/kubevirt/tests/containerdisk" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/framework/matcher" "kubevirt.io/kubevirt/tests/libdv" "kubevirt.io/kubevirt/tests/libnode" @@ -1315,8 +1314,8 @@ var _ = SIGDescribe("Hotplug", func() { renameImgFile(pvc, newDiskImgName) By("start VM with disk mutation sidecar") - hookSidecarsValue := fmt.Sprintf(`[{"args": ["--version", "v1alpha2"], "image": "%s/%s:%s", "imagePullPolicy": "IfNotPresent"}]`, - flags.KubeVirtUtilityRepoPrefix, hookSidecarImage, flags.KubeVirtUtilityVersionTag) + hookSidecarsValue := fmt.Sprintf(`[{"args": ["--version", "v1alpha2"], "image": "%s", "imagePullPolicy": "IfNotPresent"}]`, + util.GetUtilityImageFromRegistry(hookSidecarImage)) vmi := libvmi.New( libvmi.WithInterface(libvmi.InterfaceDeviceWithMasqueradeBinding()), libvmi.WithNetwork(v1.DefaultPodNetwork()), diff --git a/tests/sysprep_test.go b/tests/sysprep_test.go index a228d32c4e46..2a17359532a7 100644 --- a/tests/sysprep_test.go +++ b/tests/sysprep_test.go @@ -47,7 +47,6 @@ import ( "kubevirt.io/client-go/kubecli" "kubevirt.io/kubevirt/tests" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/libstorage" "kubevirt.io/kubevirt/tests/libwait" "kubevirt.io/kubevirt/tests/util" @@ -381,7 +380,7 @@ func winRMCliPod() *k8sv1.Pod { Containers: []k8sv1.Container{ { Name: winrmCli, - Image: fmt.Sprintf("%s/%s:%s", flags.KubeVirtUtilityRepoPrefix, winrmCli, flags.KubeVirtUtilityVersionTag), + Image: util.GetUtilityImageFromRegistry(winrmCli), Command: []string{"sleep"}, Args: []string{"3600"}, SecurityContext: &k8sv1.SecurityContext{ diff --git a/tests/vmi_cloudinit_hook_sidecar_test.go b/tests/vmi_cloudinit_hook_sidecar_test.go index ef2f1ec63b58..40fb8e915a72 100644 --- a/tests/vmi_cloudinit_hook_sidecar_test.go +++ b/tests/vmi_cloudinit_hook_sidecar_test.go @@ -43,7 +43,6 @@ import ( "kubevirt.io/kubevirt/tests" "kubevirt.io/kubevirt/tests/console" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/framework/kubevirt" "kubevirt.io/kubevirt/tests/libvmifact" "kubevirt.io/kubevirt/tests/libwait" @@ -102,8 +101,8 @@ var _ = Describe("[sig-compute]CloudInitHookSidecars", decorators.SigCompute, fu virtClient = kubevirt.Client() vmi = libvmifact.NewCirros( libvmi.WithAnnotation("hooks.kubevirt.io/hookSidecars", - fmt.Sprintf(`[{"args": ["--version", "v1alpha2"], "image": "%s/%s:%s", "imagePullPolicy": "IfNotPresent"}]`, - flags.KubeVirtUtilityRepoPrefix, cloudinitHookSidecarImage, flags.KubeVirtUtilityVersionTag))) + fmt.Sprintf(`[{"args": ["--version", "v1alpha2"], "image": "%s", "imagePullPolicy": "IfNotPresent"}]`, + util.GetUtilityImageFromRegistry(cloudinitHookSidecarImage)))) }) Describe("VMI definition", func() { diff --git a/tests/vmi_hook_sidecar_test.go b/tests/vmi_hook_sidecar_test.go index 3656519a4be1..7df0d13df815 100644 --- a/tests/vmi_hook_sidecar_test.go +++ b/tests/vmi_hook_sidecar_test.go @@ -47,7 +47,6 @@ import ( "kubevirt.io/kubevirt/tests" "kubevirt.io/kubevirt/tests/clientcmd" cd "kubevirt.io/kubevirt/tests/containerdisk" - "kubevirt.io/kubevirt/tests/flags" "kubevirt.io/kubevirt/tests/framework/checks" "kubevirt.io/kubevirt/tests/framework/kubevirt" "kubevirt.io/kubevirt/tests/libwait" @@ -357,22 +356,22 @@ func getHookSidecarLogs(virtCli kubecli.KubevirtClient, vmi *v1.VirtualMachineIn func RenderSidecar(version string) map[string]string { return map[string]string{ - "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"args": ["--version", "%s"],"image": "%s/%s:%s", "imagePullPolicy": "IfNotPresent"}]`, version, flags.KubeVirtUtilityRepoPrefix, hookSidecarImage, flags.KubeVirtUtilityVersionTag), + "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"args": ["--version", "%s"],"image": "%s", "imagePullPolicy": "IfNotPresent"}]`, version, util.GetUtilityImageFromRegistry(hookSidecarImage)), "smbios.vm.kubevirt.io/baseBoardManufacturer": "Radical Edward", } } func RenderInvalidSMBiosSidecar() map[string]string { return map[string]string{ - "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"image": "%s/%s:%s", "imagePullPolicy": "IfNotPresent"}]`, flags.KubeVirtUtilityRepoPrefix, hookSidecarImage, flags.KubeVirtUtilityVersionTag), + "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"image": "%s", "imagePullPolicy": "IfNotPresent"}]`, util.GetUtilityImageFromRegistry(hookSidecarImage)), "smbios.vm.kubevirt.io/baseBoardManufacturer": "Radical Edward", } } func RenderSidecarWithConfigMapPlusImage(version, name string) map[string]string { return map[string]string{ - "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"args": ["--version", "%s"], "image":"%s/%s:%s", "configMap": {"name": "%s","key": "%s", "hookPath": "/usr/bin/onDefineDomain"}}]`, - version, flags.KubeVirtUtilityRepoPrefix, sidecarShimImage, flags.KubeVirtVersionTag, name, configMapKey), + "hooks.kubevirt.io/hookSidecars": fmt.Sprintf(`[{"args": ["--version", "%s"], "image":"%s", "configMap": {"name": "%s","key": "%s", "hookPath": "/usr/bin/onDefineDomain"}}]`, + version, util.GetUtilityImageFromRegistry(sidecarShimImage), name, configMapKey), } }