From 5d4c4dc3044252faa4c73f25f797ff2f912aee93 Mon Sep 17 00:00:00 2001 From: Paul Yu <129891899+paulyufan2@users.noreply.github.com> Date: Thu, 14 Nov 2024 10:25:21 -0500 Subject: [PATCH] Remove bridgeName field from CNI windows conflist files (#3135) remove bridgeName field from CNI windows conflist files --- cni/azure-windows-multitenancy.conflist | 2 -- cni/azure-windows-swift-overlay-dualstack.conflist | 1 - cni/azure-windows-swift-overlay.conflist | 1 - cni/azure-windows-swift.conflist | 1 - cni/azure-windows.conflist | 4 +--- 5 files changed, 1 insertion(+), 8 deletions(-) diff --git a/cni/azure-windows-multitenancy.conflist b/cni/azure-windows-multitenancy.conflist index 008fa04c1..2c4c4b0fd 100644 --- a/cni/azure-windows-multitenancy.conflist +++ b/cni/azure-windows-multitenancy.conflist @@ -4,8 +4,6 @@ "plugins": [ { "type": "azure-vnet", - "mode": "bridge", - "bridge": "azure0", "multiTenancy":true, "enableSnatOnHost":true, "enableExactMatchForPodName": true, diff --git a/cni/azure-windows-swift-overlay-dualstack.conflist b/cni/azure-windows-swift-overlay-dualstack.conflist index 4b4e06e59..88c8cfc48 100644 --- a/cni/azure-windows-swift-overlay-dualstack.conflist +++ b/cni/azure-windows-swift-overlay-dualstack.conflist @@ -5,7 +5,6 @@ "plugins": [ { "type": "azure-vnet", - "bridge": "azure0", "capabilities": { "portMappings": true, "dns": true diff --git a/cni/azure-windows-swift-overlay.conflist b/cni/azure-windows-swift-overlay.conflist index 4b4e06e59..88c8cfc48 100644 --- a/cni/azure-windows-swift-overlay.conflist +++ b/cni/azure-windows-swift-overlay.conflist @@ -5,7 +5,6 @@ "plugins": [ { "type": "azure-vnet", - "bridge": "azure0", "capabilities": { "portMappings": true, "dns": true diff --git a/cni/azure-windows-swift.conflist b/cni/azure-windows-swift.conflist index 962a9cab6..f38685938 100644 --- a/cni/azure-windows-swift.conflist +++ b/cni/azure-windows-swift.conflist @@ -5,7 +5,6 @@ "plugins": [ { "type": "azure-vnet", - "bridge": "azure0", "executionMode": "v4swift", "capabilities": { "portMappings": true, diff --git a/cni/azure-windows.conflist b/cni/azure-windows.conflist index 201871e68..5f275dfc8 100644 --- a/cni/azure-windows.conflist +++ b/cni/azure-windows.conflist @@ -5,8 +5,6 @@ "plugins": [ { "type": "azure-vnet", - "mode": "bridge", - "bridge": "azure0", "capabilities": { "portMappings": true, "dns": true @@ -45,4 +43,4 @@ ] } ] -} \ No newline at end of file +}