From fac2b73165e7be90a4f87a2846f4f6e0231435d7 Mon Sep 17 00:00:00 2001 From: Jack Francis Date: Mon, 17 Dec 2018 10:16:53 -0800 Subject: [PATCH] Enable Azure CNI 1.0.15 (#4361) # Conflicts: # pkg/api/const.go --- pkg/api/azenvtypes.go | 4 ++-- pkg/api/const.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/api/azenvtypes.go b/pkg/api/azenvtypes.go index 99846ef1af..a5c3507404 100644 --- a/pkg/api/azenvtypes.go +++ b/pkg/api/azenvtypes.go @@ -140,7 +140,7 @@ var ( ImageOffer: "aks", ImageSku: "aks-ubuntu-1604-201812", ImagePublisher: "microsoft-aks", - ImageVersion: "2018.12.03", + ImageVersion: "2018.12.12", } // DefaultAKSDockerEngineOSImageConfig is the AKS image based on Ubuntu 16.04. @@ -148,7 +148,7 @@ var ( ImageOffer: "aks", ImageSku: "aks-ubuntu-1604-docker-engine", ImagePublisher: "microsoft-aks", - ImageVersion: "2018.12.03", + ImageVersion: "2018.12.12", } //DefaultOpenShift39RHELImageConfig is the OpenShift on RHEL distribution. diff --git a/pkg/api/const.go b/pkg/api/const.go index bd19636c07..120de309bf 100644 --- a/pkg/api/const.go +++ b/pkg/api/const.go @@ -242,7 +242,7 @@ 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.13" + AzureCniPluginVerLinux = "v1.0.15" // 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}.tgz // to https://acs-mirror.azureedge.net/cni