From 9d3e25e5041930168e8fc45b80aea0ee8ebb9422 Mon Sep 17 00:00:00 2001 From: Lana Kaleif Date: Fri, 24 Jan 2025 07:04:34 -0500 Subject: [PATCH] Fix option conflict in Zun CNI for recent Docker With recent Docker, trying to create a container via API by specifying both network 'none' and a MAC address results in a Bad Request error: 'conflicting options: mac-address and the network mode' Remove MAC address from initial container setup. Change-Id: I7749ca3f002472b7588aeac7331eda5ba6cb6d1b --- zun/network/cni_network.py | 1 - 1 file changed, 1 deletion(-) diff --git a/zun/network/cni_network.py b/zun/network/cni_network.py index e450fcb81..66890741d 100644 --- a/zun/network/cni_network.py +++ b/zun/network/cni_network.py @@ -110,7 +110,6 @@ class ZunCNI(network.Network): container.save(self.context) host_config['network_mode'] = 'none' - container_kwargs['mac_address'] = port['mac_address'] # We manipulate entrypoint and command parameters in here. token = (container.entrypoint or []) + (container.command or [])