From 3502bd44c396c46f2a175b4e4df191a63622573a Mon Sep 17 00:00:00 2001 From: andyzhangx Date: Mon, 29 Oct 2018 05:48:42 +0000 Subject: [PATCH] use china mirror in binary downloading revert kubernetescustomscript.sh change --- pkg/api/azenvtypes.go | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkg/api/azenvtypes.go b/pkg/api/azenvtypes.go index 634b715c7a..dbac9ace00 100644 --- a/pkg/api/azenvtypes.go +++ b/pkg/api/azenvtypes.go @@ -233,8 +233,8 @@ var ( CloudName: azureChinaCloud, //DockerSpecConfig specify the docker engine download repo DockerSpecConfig: DockerSpecConfig{ - DockerEngineRepo: "https://mirror.azure.cn/docker-engine/apt/repo/", - DockerComposeDownloadURL: "https://mirror.azure.cn/docker-toolbox/linux/compose", + DockerEngineRepo: "https://mirror.azk8s.cn/docker-engine/apt/repo/", + DockerComposeDownloadURL: "https://mirror.azk8s.cn/docker-toolbox/linux/compose", }, //KubernetesSpecConfig - Due to Chinese firewall issue, the default containers from google is blocked, use the Chinese local mirror instead KubernetesSpecConfig: KubernetesSpecConfig{ @@ -243,14 +243,14 @@ var ( ACIConnectorImageBase: "dockerhub.azk8s.cn/microsoft/", NVIDIAImageBase: "dockerhub.azk8s.cn/nvidia/", AzureCNIImageBase: "dockerhub.azk8s.cn/containernetworking/", - EtcdDownloadURLBase: DefaultKubernetesSpecConfig.EtcdDownloadURLBase, + EtcdDownloadURLBase: "https://mirror.azk8s.cn/kubernetes/etcd", KubeBinariesSASURLBase: DefaultKubernetesSpecConfig.KubeBinariesSASURLBase, WindowsPackageSASURLBase: DefaultKubernetesSpecConfig.WindowsPackageSASURLBase, WindowsTelemetryGUID: DefaultKubernetesSpecConfig.WindowsTelemetryGUID, - CNIPluginsDownloadURL: DefaultKubernetesSpecConfig.CNIPluginsDownloadURL, - VnetCNILinuxPluginsDownloadURL: DefaultKubernetesSpecConfig.VnetCNILinuxPluginsDownloadURL, - VnetCNIWindowsPluginsDownloadURL: DefaultKubernetesSpecConfig.VnetCNIWindowsPluginsDownloadURL, - ContainerdDownloadURLBase: "https://mirror.azure.cn/kubernetes/containerd/", + CNIPluginsDownloadURL: "https://mirror.azk8s.cn/kubernetes/containernetworking-plugins/cni-plugins-amd64-" + CNIPluginVer + ".tgz", + VnetCNILinuxPluginsDownloadURL: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/azure-vnet-cni-linux-amd64-" + AzureCniPluginVerLinux + ".tgz", + VnetCNIWindowsPluginsDownloadURL: "https://mirror.azk8s.cn/kubernetes/azure-container-networking/azure-vnet-cni-windows-amd64-" + AzureCniPluginVerWindows + ".zip", + ContainerdDownloadURLBase: "https://mirror.azk8s.cn/kubernetes/containerd/", }, DCOSSpecConfig: DCOSSpecConfig{ DCOS188BootstrapDownloadURL: fmt.Sprintf(AzureChinaCloudDCOSBootstrapDownloadURL, "5df43052907c021eeb5de145419a3da1898c58a5"),