From 5c60441d363afbbff6bb866cf57a0b253c377ff2 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Tue, 16 Jan 2018 15:30:01 -0800 Subject: [PATCH 1/2] Azure CNI version bump --- pkg/acsengine/defaults.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go index 596590d6ad..56b81bd74b 100644 --- a/pkg/acsengine/defaults.go +++ b/pkg/acsengine/defaults.go @@ -13,7 +13,7 @@ const ( // AzureCniPluginVer specifies version of Azure CNI plugin, which has been mirrored from // https://github.com/Azure/azure-container-networking/releases/download/${AZURE_PLUGIN_VER}/azure-vnet-cni-linux-amd64-${AZURE_PLUGIN_VER}.tgz // to https://acs-mirror.azureedge.net/cni/ - AzureCniPluginVer = "v1.0.0" + AzureCniPluginVer = "v1.0.1" ) var ( From 5bb06887e38562b89a3f46787c99c1eccf268da5 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Wed, 17 Jan 2018 10:16:07 -0800 Subject: [PATCH 2/2] s/conf/conflist --- parts/k8s/kubernetesmastercustomscript.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/parts/k8s/kubernetesmastercustomscript.sh b/parts/k8s/kubernetesmastercustomscript.sh index 9a3ad9e9f8..178518fb7b 100644 --- a/parts/k8s/kubernetesmastercustomscript.sh +++ b/parts/k8s/kubernetesmastercustomscript.sh @@ -243,8 +243,8 @@ function configAzureNetworkPolicy() { chmod -R 755 $CNI_BIN_DIR # Copy config file - mv $CNI_BIN_DIR/10-azure.conf $CNI_CONFIG_DIR/ - chmod 600 $CNI_CONFIG_DIR/10-azure.conf + mv $CNI_BIN_DIR/10-azure.conflist $CNI_CONFIG_DIR/ + chmod 600 $CNI_CONFIG_DIR/10-azure.conflist # Dump ebtables rules. /sbin/ebtables -t nat --list