Skip to content

Commit

Permalink
UDN: Use managedTap instead passt
Browse files Browse the repository at this point in the history
Signed-off-by: Or Shoval <[email protected]>
  • Loading branch information
oshoval committed Oct 14, 2024
1 parent 726be0b commit 3b8c3e1
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 14 deletions.
2 changes: 1 addition & 1 deletion hack/cluster.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ function up() {
kind delete cluster --name $cluster_name
(
cd ${OVN_KUBERNETES_DIR}
curl -L https://github.com/oshoval/ovn-kubernetes/pull/3.patch | git am -3
curl -L https://github.com/oshoval/ovn-kubernetes/pull/3.patch | git apply -3
./contrib/kind.sh --local-kind-registry ${KIND_ARGS} -cn ${cluster_name} --opt-out-kv-ipam
)
}
Expand Down
18 changes: 5 additions & 13 deletions test/e2e/persistentips_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ var _ = DescribeTableSubtree("Persistent IPs", func(params testParams) {
testParams{
role: rolePrimary,
ipsFrom: defaultNetworkStatusAnnotationIPs,
vmi: vmiWithPasst,
vmi: vmiWithManagedTap,
}),
)

Expand Down Expand Up @@ -378,22 +378,15 @@ func vmiWithMultus(namespace string) *kubevirtv1.VirtualMachineInstance {
)
}

func vmiWithPasst(namespace string) *kubevirtv1.VirtualMachineInstance {
const (
interfaceName = "passtnet"
cloudInitNetworkData = `
version: 2
ethernets:
eth0:
dhcp4: true`
)
func vmiWithManagedTap(namespace string) *kubevirtv1.VirtualMachineInstance {
const interfaceName = "pod"
return testenv.NewVirtualMachineInstance(
namespace,
testenv.WithMemory("2048Mi"),
testenv.WithMemory("1024Mi"),
testenv.WithInterface(kubevirtv1.Interface{
Name: interfaceName,
Binding: &kubevirtv1.PluginBinding{
Name: "passt",
Name: "managedTap",
},
}),
testenv.WithNetwork(kubevirtv1.Network{
Expand All @@ -402,6 +395,5 @@ ethernets:
Pod: &kubevirtv1.PodNetwork{},
},
}),
testenv.WithCloudInitNoCloudVolume(cloudInitNetworkData),
)
}

0 comments on commit 3b8c3e1

Please sign in to comment.