diff --git a/packer/install-dependencies.sh b/packer/install-dependencies.sh index 4c260e1335..73c9e9e359 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.22 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..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.18" + 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.18" + 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 3694da572a..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.18", + 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",