зеркало из https://github.com/Azure/aks-engine.git
updating azure cni version to v1.1.0 (#3075)
This commit is contained in:
Родитель
5b1aabd016
Коммит
a1a1adbc68
|
@ -334,11 +334,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://kubernetesartifacts.azureedge.net/azure-cni
|
||||
AzureCniPluginVerLinux = "v1.0.33"
|
||||
AzureCniPluginVerLinux = "v1.1.0"
|
||||
// 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://kubernetesartifacts.azureedge.net/azure-cni
|
||||
AzureCniPluginVerWindows = "v1.0.33"
|
||||
AzureCniPluginVerWindows = "v1.1.0"
|
||||
// CNIPluginVer specifies the version of CNI implementation
|
||||
// https://github.com/containernetworking/plugins
|
||||
CNIPluginVer = "v0.8.5"
|
||||
|
|
|
@ -540,7 +540,7 @@ func getDefaultContainerService() *ContainerService {
|
|||
EtcdVersion: "3.0.0",
|
||||
EtcdDiskSizeGB: "256",
|
||||
EtcdEncryptionKey: "sampleEncruptionKey",
|
||||
AzureCNIVersion: "1.0.33",
|
||||
AzureCNIVersion: "1.1.0",
|
||||
AzureCNIURLLinux: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/linux",
|
||||
AzureCNIURLWindows: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/windows",
|
||||
KeyVaultSku: "Basic",
|
||||
|
|
|
@ -89,9 +89,9 @@ function Get-FilesToCacheOnVHD
|
|||
"https://kubernetesartifacts.azureedge.net/kubernetes/v1.18.2/windowszip/v1.18.2-1int.zip"
|
||||
);
|
||||
"c:\akse-cache\win-vnet-cni\" = @(
|
||||
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.0.29/binaries/azure-vnet-cni-windows-amd64-v1.0.29.zip",
|
||||
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.0.30/binaries/azure-vnet-cni-windows-amd64-v1.0.30.zip",
|
||||
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.0.33/binaries/azure-vnet-cni-windows-amd64-v1.0.33.zip"
|
||||
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.0.33/binaries/azure-vnet-cni-windows-amd64-v1.0.33.zip",
|
||||
"https://kubernetesartifacts.azureedge.net/azure-cni/v1.1.0/binaries/azure-vnet-cni-windows-amd64-v1.1.0.zip"
|
||||
)
|
||||
}
|
||||
|
||||
|
|
|
@ -86,9 +86,9 @@ cat << EOF >> ${VHD_LOGS_FILEPATH}
|
|||
EOF
|
||||
|
||||
VNET_CNI_VERSIONS="
|
||||
1.1.0
|
||||
1.0.33
|
||||
1.0.30
|
||||
1.0.29
|
||||
"
|
||||
for VNET_CNI_VERSION in $VNET_CNI_VERSIONS; do
|
||||
VNET_CNI_PLUGINS_URL="https://kubernetesartifacts.azureedge.net/azure-cni/v${VNET_CNI_VERSION}/binaries/azure-vnet-cni-linux-amd64-v${VNET_CNI_VERSION}.tgz"
|
||||
|
|
Загрузка…
Ссылка в новой задаче