From b7196cc13b1af95a2aa2f924ea673480a2115c91 Mon Sep 17 00:00:00 2001 From: rjdenney Date: Wed, 11 May 2022 14:04:46 -0400 Subject: [PATCH 1/2] Fix the CNI conflist of multitenancy and add the correct ipam type --- cni/azure-linux-multitenancy.conflist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cni/azure-linux-multitenancy.conflist b/cni/azure-linux-multitenancy.conflist index 81c49a975e..7715470ae2 100644 --- a/cni/azure-linux-multitenancy.conflist +++ b/cni/azure-linux-multitenancy.conflist @@ -12,7 +12,7 @@ "enableExactMatchForPodName": false, "enableSnatOnHost":true, "ipam":{ - "type":"azure-vnet-ipam" + "type":"azure-cns" }, "dns":{ "nameservers":[] From 13bb30c8526a7bd0f2390f8fc45d318d961cec29 Mon Sep 17 00:00:00 2001 From: rjdenney Date: Tue, 17 May 2022 14:55:12 -0400 Subject: [PATCH 2/2] Adding the change to windows --- cni/azure-windows-multitenancy.conflist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cni/azure-windows-multitenancy.conflist b/cni/azure-windows-multitenancy.conflist index 38833b8320..20fb366673 100644 --- a/cni/azure-windows-multitenancy.conflist +++ b/cni/azure-windows-multitenancy.conflist @@ -13,7 +13,7 @@ "portMappings": true }, "ipam": { - "type": "azure-vnet-ipam" + "type": "azure-cns" }, "dns": { "Nameservers": [