From bae15e3a417d56433738a312409fecdf0511261e Mon Sep 17 00:00:00 2001 From: xiongww Date: Mon, 10 Jul 2023 10:16:02 +0800 Subject: [PATCH] fix ifname len exceed 12, for example kubevirt v1.0.0 gen ifname --- pkg/daemon/ovs_linux.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go index aec58949d8e..a6b3312cda0 100644 --- a/pkg/daemon/ovs_linux.go +++ b/pkg/daemon/ovs_linux.go @@ -191,6 +191,9 @@ func generateNicName(containerID, ifname string) (string, string) { if ifname == "eth0" { return fmt.Sprintf("%s_h", containerID[0:12]), fmt.Sprintf("%s_c", containerID[0:12]) } + if (len(ifname) >= 12 ) { + return fmt.Sprintf("%s_%s_h", containerID[0:6], ifname[11:len(ifname)]), fmt.Sprintf("%s_%s_c", containerID[0:6], ifname[11:len(ifname)]) + } return fmt.Sprintf("%s_%s_h", containerID[0:12-len(ifname)], ifname), fmt.Sprintf("%s_%s_c", containerID[0:12-len(ifname)], ifname) }