poc, kubevirt: Use vm name as dhcp hostname

Signed-off-by: Enrique Llorente <ellorent@redhat.com>
ovn-org · Feb 16, 2023 · 73959aa · 73959aa
1 parent 2f9b294
commit 73959aa
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/go-controller/pkg/dhcp/dhcp.go b/go-controller/pkg/dhcp/dhcp.go
@@ -10,7 +10,7 @@ import (
 	clientset "k8s.io/client-go/kubernetes"
 )
 
-func ComposeOptionsWithKubeDNS(k8scli clientset.Interface, cidr string, router string) (*nbdb.DHCPOptions, error) {
+func ComposeOptionsWithKubeDNS(k8scli clientset.Interface, hostname string, cidr string, router string) (*nbdb.DHCPOptions, error) {
 	dnsServer, err := kubeDNSNameServer(k8scli)
 	if err != nil {
 		return nil, err
@@ -24,6 +24,7 @@ func ComposeOptionsWithKubeDNS(k8scli clientset.Interface, cidr string, router s
 			"dns_server": dnsServer,
 			"server_id":  router,
 			"server_mac": "c0:ff:ee:00:00:01", /*TODO: Generate it*/
+			"hostname":   hostname,
 		},
 	}
 

diff --git a/go-controller/pkg/ovn/pods.go b/go-controller/pkg/ovn/pods.go
@@ -305,7 +305,8 @@ func (oc *DefaultNetworkController) addDHCPOptions(pod *kapi.Pod, lsp *nbdb.Logi
 	// Fake router to delegate on proxy arp mechanism
 	router := arpProxyAddress
 	cidr := switchSubnets[0].String()
-	dhcpOptions, err := dhcp.ComposeOptionsWithKubeDNS(oc.client, cidr, router)
+	hostname := pod.Labels[kubevirt.VMLabel]
+	dhcpOptions, err := dhcp.ComposeOptionsWithKubeDNS(oc.client, hostname, cidr, router)
 	if err != nil {
 		return fmt.Errorf("failed composing DHCP options: %v", err)
 	}