Skip to content

Commit

Permalink
tests: Use GetUtilityImageFromRegistry() function
Browse files Browse the repository at this point in the history 
Signed-off-by: Vasiliy Ulyanov <vulyanov@suse.de>
  • Loading branch information
@vasiliy-ul
vasiliy-ul committed Mar 19, 2024
1 parent c48d6fe commit ca9f522
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 22 deletions.
2 changes: 1 addition & 1 deletion tests/libpod/BUILD.bazel
View file
Expand Up @@ -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",
Expand Down
10 changes: 4 additions & 6 deletions tests/libpod/render.go
View file
Expand Up @@ -20,17 +20,15 @@
package libpod

import (
"fmt"

v1 "k8s.io/api/core/v1"
v12 "k8s.io/apimachinery/pkg/apis/meta/v1"

v13 "kubevirt.io/api/core/v1"

"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 {
Expand All @@ -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),
Expand All @@ -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),
Expand Down Expand Up @@ -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{
{
Expand Down
3 changes: 1 addition & 2 deletions tests/libstorage/pvc.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down
5 changes: 2 additions & 3 deletions tests/storage/hotplug.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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()),
Expand Down
3 changes: 1 addition & 2 deletions tests/sysprep_test.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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{
Expand Down
5 changes: 2 additions & 3 deletions tests/vmi_cloudinit_hook_sidecar_test.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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() {
Expand Down
9 changes: 4 additions & 5 deletions tests/vmi_hook_sidecar_test.go
View file
Expand Up @@ -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"
Expand Down Expand Up @@ -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),
}
}

Expand Down

0 comments on commit ca9f522

Please sign in to comment.