Update GCR URLs to reference Azure CDN (Azure#2042)

* update k8s Docker URLs to use Azure CDN consistently * fix a typo in documentation
idanlevin · Jan 11, 2018 · 962d725 · 962d725
1 parent 4599ca4
commit 962d725
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 22 deletions.
diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md
@@ -30,7 +30,7 @@ Here are the valid values for the orchestrator types:
 
 |Name|Required|Description|
 |---|---|---|
-|kubernetesImageBase|no|This specifies the base URL (everything preceding the actual image filename) of the kubernetes hyperkube image to use for cluster deploymenbt, e.g., `gcrio.azureedge.net/google_containers/`.|
+|kubernetesImageBase|no|This specifies the base URL (everything preceding the actual image filename) of the kubernetes hyperkube image to use for cluster deployment, e.g., `k8s-gcrio.azureedge.net/`.|
 |dockerEngineVersion|no|Which version of docker-engine to use in your cluster, e.g.. "17.03.*"|
 |networkPolicy|no|Specifies the network policy tool for the cluster. Valid values are:<br>`"azure"` (default), which provides an Azure native networking experience,<br>`none` for not enforcing any network policy,<br>`calico` for Calico network policy (clusters with Linux agents only).<br>See [network policy examples](../examples/networkpolicy) for more information.|
 |clusterSubnet|no|The IP subnet used for allocating IP addresses for pod network interfaces. The subnet must be in the VNET address space. Default value is 10.244.0.0/16.|

diff --git a/examples/scale-up/kubernetes_orignal_params.json b/examples/scale-up/kubernetes_orignal_params.json
@@ -45,31 +45,31 @@
     "value": ""
   },
   "kubernetesAddonManagerSpec": {
-    "value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
+    "value": "k8s-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
   },
   "kubernetesAddonResizerSpec": {
-    "value": "k8s.gcr.io/addon-resizer:1.6"
+    "value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
   },
   "kubernetesDNSMasqSpec": {
-    "value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
+    "value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
   },
   "kubernetesDashboardSpec": {
-    "value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
+    "value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
   },
   "kubernetesExecHealthzSpec": {
-    "value": "k8s.gcr.io/exechealthz-amd64:1.2"
+    "value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
   },
   "kubernetesHeapsterSpec": {
-    "value": "k8s.gcr.io/heapster:v1.2.0"
+    "value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
   },
   "kubernetesHyperkubeSpec": {
-    "value": "k8s.gcr.io/hyperkube-amd64:v1.5.3"
+    "value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.5.3"
   },
   "kubernetesKubeDNSSpec": {
-    "value": "k8s.gcr.io/kubedns-amd64:1.7"
+    "value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
   },
   "kubernetesPodInfraContainerSpec": {
-    "value": "k8s.gcr.io/pause-amd64:3.0"
+    "value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
   },
   "linuxAdminUsername": {
     "value": "azureuser"

diff --git a/examples/scale-up/kubernetes_scale_up_params.json b/examples/scale-up/kubernetes_scale_up_params.json
@@ -51,31 +51,31 @@
     "value": ""
   },
   "kubernetesAddonManagerSpec": {
-    "value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
+    "value": "k8s-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
   },
   "kubernetesAddonResizerSpec": {
-    "value": "k8s.gcr.io/addon-resizer:1.6"
+    "value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
   },
   "kubernetesDNSMasqSpec": {
-    "value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
+    "value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
   },
   "kubernetesDashboardSpec": {
-    "value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
+    "value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
   },
   "kubernetesExecHealthzSpec": {
-    "value": "k8s.gcr.io/exechealthz-amd64:1.2"
+    "value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
   },
   "kubernetesHeapsterSpec": {
-    "value": "k8s.gcr.io/heapster:v1.2.0"
+    "value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
   },
   "kubernetesHyperkubeSpec": {
-    "value": "k8s.gcr.io/hyperkube-amd64:v1.5.3"
+    "value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.5.3"
   },
   "kubernetesKubeDNSSpec": {
-    "value": "k8s.gcr.io/kubedns-amd64:1.7"
+    "value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
   },
   "kubernetesPodInfraContainerSpec": {
-    "value": "k8s.gcr.io/pause-amd64:3.0"
+    "value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
   },
   "linuxAdminUsername": {
     "value": "azureuser"

diff --git a/extensions/prometheus-grafana-k8s/v1/prometheus_values.yaml b/extensions/prometheus-grafana-k8s/v1/prometheus_values.yaml
@@ -186,7 +186,7 @@ kubeStateMetrics:
   ## kube-state-metrics container image
   ##
   image:
-    repository: k8s.gcr.io/kube-state-metrics
+    repository: k8s-gcrio.azureedge.net/kube-state-metrics
     tag: v1.1.0-rc.0
     pullPolicy: IfNotPresent
 

diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -19,7 +19,7 @@ const (
 var (
 	//DefaultKubernetesSpecConfig is the default Docker image source of Kubernetes
 	DefaultKubernetesSpecConfig = KubernetesSpecConfig{
-		KubernetesImageBase:              "gcrio.azureedge.net/google_containers/",
+		KubernetesImageBase:              "k8s-gcrio.azureedge.net/",
 		TillerImageBase:                  "gcrio.azureedge.net/kubernetes-helm/",
 		ACIConnectorImageBase:            "microsoft/",
 		EtcdDownloadURLBase:              "https://acs-mirror.azureedge.net/github-coreos",

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -358,7 +358,7 @@ func FormatAzureProdFQDN(fqdnPrefix string, location string) string {
 }
 
 //GetCloudSpecConfig returns the kubenernetes container images url configurations based on the deploy target environment
-//for example: if the target is the public azure, then the default container image url should be gcrio.azureedge.net/google_container/...
+//for example: if the target is the public azure, then the default container image url should be k8s-gcrio.azureedge.net/...
 //if the target is azure china, then the default container image should be mirror.azure.cn:5000/google_container/...
 func GetCloudSpecConfig(location string) AzureEnvironmentSpecConfig {
 	switch GetCloudTargetEnv(location) {