From 6a1a74c8aebce0f60dbb63885982073184de68d7 Mon Sep 17 00:00:00 2001 From: yaroslavborbat Date: Thu, 31 Oct 2024 14:17:45 +0300 Subject: [PATCH 1/2] test Signed-off-by: yaroslavborbat --- .../patches/099-disable-dhcp.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 images/virt-artifact/patches/099-disable-dhcp.patch diff --git a/images/virt-artifact/patches/099-disable-dhcp.patch b/images/virt-artifact/patches/099-disable-dhcp.patch new file mode 100644 index 000000000..afbe98f56 --- /dev/null +++ b/images/virt-artifact/patches/099-disable-dhcp.patch @@ -0,0 +1,30 @@ +diff --git a/pkg/network/setup/podnic.go b/pkg/network/setup/podnic.go +index 473ca555d8..87952d5331 100644 +--- a/pkg/network/setup/podnic.go ++++ b/pkg/network/setup/podnic.go +@@ -20,6 +20,7 @@ + package network + + import ( ++ goerrors "errors" + "fmt" + "os" + +@@ -27,8 +28,6 @@ import ( + "kubevirt.io/client-go/log" + "kubevirt.io/client-go/precond" + +- goerrors "errors" +- + "kubevirt.io/kubevirt/pkg/network/cache" + dhcpconfigurator "kubevirt.io/kubevirt/pkg/network/dhcp" + "kubevirt.io/kubevirt/pkg/network/domainspec" +@@ -67,7 +66,7 @@ func newPhase2PodNIC(vmi *v1.VirtualMachineInstance, network *v1.Network, iface + podnic.podInterfaceName = ifaceLink.Attrs().Name + } + +- podnic.dhcpConfigurator = podnic.newDHCPConfigurator() ++ podnic.dhcpConfigurator = nil + podnic.domainGenerator = podnic.newLibvirtSpecGenerator(domain, domainAttachment) + + return podnic, nil From 17fde35c253af69a0ac3232f08fa5fb8df3c28eb Mon Sep 17 00:00:00 2001 From: Nikita Korolev Date: Thu, 31 Oct 2024 14:50:54 +0300 Subject: [PATCH 2/2] chore: remove stage setup in virt-artifact Signed-off-by: Nikita Korolev --- images/virt-artifact/werf.inc.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/images/virt-artifact/werf.inc.yaml b/images/virt-artifact/werf.inc.yaml index d0c18adc5..4cd05fdcf 100644 --- a/images/virt-artifact/werf.inc.yaml +++ b/images/virt-artifact/werf.inc.yaml @@ -54,7 +54,6 @@ shell: go mod vendor - setup: - mkdir /kubevirt-binaries - mkdir /kubevirt-config-files - cd /kubevirt