E2E: Cleanup libvit DHCP config

Use Ironic dnsmasq container for DHCP.
This requires a workaround for now, since the keepalived image we use
doesn't support any other IP range than /32.

Signed-off-by: Lennart Jern <[email protected]>

Author: lentzi90

hack/e2e/net.xml

@@ -6,10 +6,5 @@
     </nat>
   </forward>
   <bridge name='metal3'/>
-  <ip address='192.168.222.1' netmask='255.255.255.0'>
-    <dhcp>
-      <range start='192.168.222.3' end='192.168.222.99'/>
-      <bootp file='http://192.168.222.2:6180/boot.ipxe'/>
-    </dhcp>
-  </ip>
+  <ip address='192.168.222.1' netmask='255.255.255.0'/>
 </network>

test/e2e/common.go

@@ -778,3 +778,31 @@ type WaitForIronicInput struct {
 	Namespace string
 	Intervals []interface{} // e.g. []interface{}{time.Minute * 15, time.Second * 5}
 }
+
+// ConfigureProvisioningNetwork adds the provisioning IP with /24 netmask to the kind cluster node.
+// TODO(lentzi90): Implement support for this in the keepalived image we use.
+// This is a workaround for the fact that keepalived only adds a /32 address, which causes
+// dnsmasq to fail with "no address range available for DHCP request" because it cannot
+// find a matching subnet for the DHCP range.
+// See https://github.com/metal3-io/baremetal-operator/issues/2792
+func ConfigureProvisioningNetwork(ctx context.Context, clusterName string, provisioningIP string) {
+	containerName := clusterName + "-control-plane"
+	// Add the provisioning IP with /24 netmask to eth0
+	// This allows dnsmasq to see the DHCP range as part of the local subnet
+	ipWithCIDR := provisioningIP + "/24"
+
+	Logf("Configuring provisioning network: adding %s to %s", ipWithCIDR, containerName)
+
+	cmd := testexec.NewCommand(
+		testexec.WithCommand("docker"),
+		testexec.WithArgs("exec", containerName, "ip", "addr", "add", ipWithCIDR, "dev", "eth0"),
+	)
+
+	stdout, stderr, err := cmd.Run(ctx)
+	// Ignore "RTNETLINK answers: File exists" error - the address may already be configured
+	if err != nil && !strings.Contains(string(stderr), "File exists") {
+		Logf("Warning: failed to configure provisioning network: %v\nstdout: %s\nstderr: %s", err, string(stdout), string(stderr))
+	} else {
+		Logf("Provisioning network configured successfully")
+	}
+}

test/e2e/config/fixture.yaml

@@ -35,6 +35,7 @@ variables:
   CERT_MANAGER_VERSION: "v1.17.1"
   SSH_CHECK_PROVISIONED: "false"
   FETCH_IRONIC_NODES: "false"
+  IRONIC_PROVISIONING_IP: "192.168.222.2"
   # Boot mode can be legacy, UEFI or UEFISecureBoot
   BOOT_MODE: "UEFI"
 

test/e2e/e2e_suite_test.go

@@ -93,6 +93,10 @@ var _ = SynchronizedBeforeSuite(func() []byte {
 		})
 		Expect(clusterProvider).ToNot(BeNil(), "Failed to create a cluster")
 		kubeconfigPath = clusterProvider.GetKubeconfigPath()
+
+		// Configure provisioning network for dnsmasq to work properly.
+		// TODO(lentzi90): This is a workaround. Fix it properly and get rid of it.
+		ConfigureProvisioningNetwork(ctx, "bmo-e2e", e2eConfig.GetVariable("IRONIC_PROVISIONING_IP"))
 	}
 	Expect(kubeconfigPath).To(BeAnExistingFile(), "Failed to get the kubeconfig file for the cluster")
 

test/e2e/upgrade_test.go

@@ -378,6 +378,10 @@ var _ = Describe("Upgrade", Label("optional", "upgrade"), func() {
 			})
 			Expect(upgradeClusterProvider).ToNot(BeNil(), "Failed to create a cluster")
 			kubeconfigPath = upgradeClusterProvider.GetKubeconfigPath()
+
+			// Configure provisioning network for dnsmasq to work properly.
+			// TODO(lentzi90): This is a workaround. Fix it properly and get rid of it.
+			ConfigureProvisioningNetwork(ctx, upgradeClusterName, e2eConfig.GetVariable("IRONIC_PROVISIONING_IP"))
 		}
 		Expect(kubeconfigPath).To(BeAnExistingFile(), "Failed to get the kubeconfig file for the cluster")
 		scheme := runtime.NewScheme()