Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

Commit

Permalink
Enable Azure CNI 1.0.15 (#4361)
Browse files Browse the repository at this point in the history
# Conflicts:
#	pkg/api/const.go
  • Loading branch information
jackfrancis committed Dec 17, 2018
1 parent 637285f commit fac2b73
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions pkg/api/azenvtypes.go
Original file line number Diff line number Diff line change
Expand Up @@ -140,15 +140,15 @@ 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.
DefaultAKSDockerEngineOSImageConfig = AzureOSImageConfig{
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.
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit fac2b73

Please sign in to comment.