From cc868d9923889bc23c6b67f72ae12e1b8c58d5be Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Wed, 1 May 2019 13:39:15 -0700 Subject: [PATCH 1/2] chore: update Azure CNI version to v1.0.21 --- packer/install-dependencies.sh | 2 +- pkg/api/const.go | 4 ++-- pkg/api/converterfromapi_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 4c260e1335..7fc16719aa 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -62,8 +62,8 @@ echo " - nvidia-docker2 nvidia-container-runtime" >> ${RELEASE_NOTES_FILEPATH} installClearContainersRuntime VNET_CNI_VERSIONS=" +1.0.21 1.0.18 -1.0.17 " for VNET_CNI_VERSION in $VNET_CNI_VERSIONS; do VNET_CNI_PLUGINS_URL="https://acs-mirror.azureedge.net/cni/azure-vnet-cni-linux-amd64-v${VNET_CNI_VERSION}.tgz" diff --git a/pkg/api/const.go b/pkg/api/const.go index c97920ab6f..c43601c919 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -288,11 +288,11 @@ const ( // AzureCniPluginVerLinux 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 - AzureCniPluginVerLinux = "v1.0.18" + AzureCniPluginVerLinux = "v1.0.21" // AzureCniPluginVerWindows 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-windows-amd64-${AZURE_PLUGIN_VER}.zip // to https://acs-mirror.azureedge.net/cni - AzureCniPluginVerWindows = "v1.0.18" + AzureCniPluginVerWindows = "v1.0.21" // CNIPluginVer specifies the version of CNI implementation // https://github.com/containernetworking/plugins CNIPluginVer = "v0.7.5" diff --git a/pkg/api/converterfromapi_test.go b/pkg/api/converterfromapi_test.go index 3694da572a..a1f59d7ac7 100644 --- a/pkg/api/converterfromapi_test.go +++ b/pkg/api/converterfromapi_test.go @@ -566,7 +566,7 @@ func getDefaultContainerService() *ContainerService { EtcdVersion: "3.0.0", EtcdDiskSizeGB: "256", EtcdEncryptionKey: "sampleEncruptionKey", - AzureCNIVersion: "1.0.18", + AzureCNIVersion: "1.0.21", AzureCNIURLLinux: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/linux", AzureCNIURLWindows: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/windows", KeyVaultSku: "Basic", From ad4885783bd4fdbe481f4b4baeed7290066135cd Mon Sep 17 00:00:00 2001 From: Cecile Robert-Michon Date: Fri, 3 May 2019 09:42:07 -0700 Subject: [PATCH 2/2] bump version to 1.0.22 --- packer/install-dependencies.sh | 2 +- pkg/api/const.go | 4 ++-- pkg/api/converterfromapi_test.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 7fc16719aa..73c9e9e359 100644 --- a/packer/install-dependencies.sh +++ b/packer/install-dependencies.sh @@ -62,7 +62,7 @@ echo " - nvidia-docker2 nvidia-container-runtime" >> ${RELEASE_NOTES_FILEPATH} installClearContainersRuntime VNET_CNI_VERSIONS=" -1.0.21 +1.0.22 1.0.18 " for VNET_CNI_VERSION in $VNET_CNI_VERSIONS; do diff --git a/pkg/api/const.go b/pkg/api/const.go index c43601c919..e5ded05363 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -288,11 +288,11 @@ const ( // AzureCniPluginVerLinux 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 - AzureCniPluginVerLinux = "v1.0.21" + AzureCniPluginVerLinux = "v1.0.22" // AzureCniPluginVerWindows 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-windows-amd64-${AZURE_PLUGIN_VER}.zip // to https://acs-mirror.azureedge.net/cni - AzureCniPluginVerWindows = "v1.0.21" + AzureCniPluginVerWindows = "v1.0.22" // CNIPluginVer specifies the version of CNI implementation // https://github.com/containernetworking/plugins CNIPluginVer = "v0.7.5" diff --git a/pkg/api/converterfromapi_test.go b/pkg/api/converterfromapi_test.go index a1f59d7ac7..27447d077d 100644 --- a/pkg/api/converterfromapi_test.go +++ b/pkg/api/converterfromapi_test.go @@ -566,7 +566,7 @@ func getDefaultContainerService() *ContainerService { EtcdVersion: "3.0.0", EtcdDiskSizeGB: "256", EtcdEncryptionKey: "sampleEncruptionKey", - AzureCNIVersion: "1.0.21", + AzureCNIVersion: "1.0.22", AzureCNIURLLinux: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/linux", AzureCNIURLWindows: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/windows", KeyVaultSku: "Basic",