remove bridgeName field from CNI windows conflist files

paulyufan2 · paulyufan2 · commit abe6d7784887 · 2024-11-14T09:45:38.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -5,8 +5,6 @@
     "plugins": [
         {
             "type": "azure-vnet",
-            "mode": "bridge",
-            "bridge": "azure0",
             "capabilities": {
                 "portMappings": true,
                 "dns": true
@@ -45,4 +43,4 @@
             ]
         }
     ]
-}
+}

Original file line number	Diff line number	Diff line change
`@@ -4,8 +4,6 @@`
`4`	`4`	`"plugins": [`
`5`	`5`	`{`
`6`	`6`	`"type": "azure-vnet",`
`7`		`- "mode": "bridge",`
`8`		`- "bridge": "azure0",`
`9`	`7`	`"multiTenancy":true,`
`10`	`8`	`"enableSnatOnHost":true,`
`11`	`9`	`"enableExactMatchForPodName": true,`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`	`"plugins": [`
`6`	`6`	`{`
`7`	`7`	`"type": "azure-vnet",`
`8`		`- "bridge": "azure0",`
`9`	`8`	`"capabilities": {`
`10`	`9`	`"portMappings": true,`
`11`	`10`	`"dns": true`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,6 @@`
`5`	`5`	`"plugins": [`
`6`	`6`	`{`
`7`	`7`	`"type": "azure-vnet",`
`8`		`- "mode": "bridge",`
`9`		`- "bridge": "azure0",`
`10`	`8`	`"capabilities": {`
`11`	`9`	`"portMappings": true,`
`12`	`10`	`"dns": true`
`@@ -45,4 +43,4 @@`
`45`	`43`	`]`
`46`	`44`	`}`
`47`	`45`	`]`
`48`		`-}`
	`46`	`+}`