retire Azure CDN for container image repository proxying (#3535)

Azure · Jul 24, 2018 · f95af89 · f95af89
1 parent b272457
commit f95af89
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 28 deletions.
diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md
@@ -52,7 +52,7 @@ Here are the valid values for the orchestrator types:
 | gcHighThreshold                 | no       | Sets the --image-gc-high-threshold value on the kublet configuration. Default is 85. [See kubelet Garbage Collection](https://kubernetes.io/docs/concepts/cluster-administration/kubelet-garbage-collection/)                                                                                                                                                                                                 |
 | gcLowThreshold                  | no       | Sets the --image-gc-low-threshold value on the kublet configuration. Default is 80. [See kubelet Garbage Collection](https://kubernetes.io/docs/concepts/cluster-administration/kubelet-garbage-collection/)                                                                                                                                                                                                  |
 | kubeletConfig                   | no       | Configure various runtime configuration for kubelet. See `kubeletConfig` [below](#feat-kubelet-config)                                                                                                                                                                                                                                                                                                        |
-| kubernetesImageBase             | no       | 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/`                                                                                                                                                                                                                                     |
+| kubernetesImageBase             | no       | Specifies the base URL (everything preceding the actual image filename) of the kubernetes hyperkube image to use for cluster deployment, e.g., `k8s.gcr.io/`                                                                                                                                                                                                                                     |
 | networkPlugin                   | no       | Specifies the network plugin implementation for the cluster. Valid values are:<br>`"azure"` (default), which provides an Azure native networking experience <br>`"kubenet"` for k8s software networking implementation. <br> `"flannel"` for using CoreOS Flannel <br> `"cilium"` for using the default Cilium CNI IPAM                                                                                       |
 | networkPolicy                   | no       | Specifies the network policy enforcement tool for the cluster (currently Linux-only). Valid values are:<br>`"calico"` for Calico network policy.<br>`"cilium"` for cilium network policy (Lin), and `"azure"` (experimental) for Azure CNI-compliant network policy (note: Azure CNI-compliant network policy requires explicit `"networkPlugin": "azure"` configuration as well).<br>See [network policy examples](../examples/networkpolicy) for more information.                                                                                                                                  |
 | privateCluster                  | no       | Build a cluster without public addresses assigned. See `privateClusters` [below](#feat-private-cluster).                                                                                                                                                                                                                                                                                                      |

diff --git a/docs/kubernetes/k8s-developers.md b/docs/kubernetes/k8s-developers.md
@@ -23,7 +23,7 @@ cd ../../..
 * Push your Docker image to Docker Hub:
 
 ```
-docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
+docker tag k8s.gcr.io/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
 docker push dockerhubid/hyperkube-amd64:sometag
 ```
 

diff --git a/examples/addons/cluster-autoscaler/README.md b/examples/addons/cluster-autoscaler/README.md
@@ -77,7 +77,7 @@ Follow the README at https://github.com/kubernetes/autoscaler/tree/master/cluste
 | minNodes       | no       | minimum node count                | 1                                                          |
 | maxNodes       | no       | maximum node count                | 5                                                          |
 | name           | no       | container name                    | "cluster-autoscaler"                                       |
-| image          | no       | image                             | "gcrio.azureedge.net/google-containers/cluster-autoscaler" |
+| image          | no       | image                             | "gcr.io/google-containers/cluster-autoscaler" |
 | cpuRequests    | no       | cpu requests for the container    | "100m"                                                     |
 | memoryRequests | no       | memory requests for the container | "300Mi"                                                    |
 | cpuLimits      | no       | cpu limits for the container      | "100m"                                                     |

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-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
+    "value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
   },
   "kubernetesAddonResizerSpec": {
-    "value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
+    "value": "k8s.gcr.io/addon-resizer:1.6"
   },
   "kubernetesDNSMasqSpec": {
-    "value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
+    "value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
   },
   "kubernetesDashboardSpec": {
-    "value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
+    "value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
   },
   "kubernetesExecHealthzSpec": {
-    "value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
+    "value": "k8s.gcr.io/exechealthz-amd64:1.2"
   },
   "kubernetesHeapsterSpec": {
-    "value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
+    "value": "k8s.gcr.io/heapster:v1.2.0"
   },
   "kubernetesHyperkubeSpec": {
-    "value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.6.13"
+    "value": "k8s.gcr.io/hyperkube-amd64:v1.6.13"
   },
   "kubernetesKubeDNSSpec": {
-    "value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
+    "value": "k8s.gcr.io/kubedns-amd64:1.7"
   },
   "kubernetesPodInfraContainerSpec": {
-    "value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
+    "value": "k8s.gcr.io/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-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
+    "value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
   },
   "kubernetesAddonResizerSpec": {
-    "value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
+    "value": "k8s.gcr.io/addon-resizer:1.6"
   },
   "kubernetesDNSMasqSpec": {
-    "value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
+    "value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
   },
   "kubernetesDashboardSpec": {
-    "value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
+    "value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
   },
   "kubernetesExecHealthzSpec": {
-    "value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
+    "value": "k8s.gcr.io/exechealthz-amd64:1.2"
   },
   "kubernetesHeapsterSpec": {
-    "value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
+    "value": "k8s.gcr.io/heapster:v1.2.0"
   },
   "kubernetesHyperkubeSpec": {
-    "value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.6.13"
+    "value": "k8s.gcr.io/hyperkube-amd64:v1.6.13"
   },
   "kubernetesKubeDNSSpec": {
-    "value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
+    "value": "k8s.gcr.io/kubedns-amd64:1.7"
   },
   "kubernetesPodInfraContainerSpec": {
-    "value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
+    "value": "k8s.gcr.io/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
@@ -194,7 +194,7 @@ kubeStateMetrics:
   ## kube-state-metrics container image
   ##
   image:
-    repository: k8s-gcrio.azureedge.net/kube-state-metrics
+    repository: k8s.gcr.io/kube-state-metrics
     tag: v1.2.0
     pullPolicy: IfNotPresent
 

diff --git a/jenkins/Jenkinsfile.azure.kubernetes b/jenkins/Jenkinsfile.azure.kubernetes
@@ -55,7 +55,7 @@ node(env.NODE? env.NODE : 'slave') {
             sh("docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_PASSWORD} ${REGISTRY_USERNAME}.azurecr.io")
 
             // We retag the gcr image from hyperkube-amd64 to just hyperkube since we can use image tags for separate architectures
-            sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
+            sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag k8s.gcr.io/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
             sh("cd /go/src/github.com/kubernetes/kubernetes && docker push ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
           }
         }

diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -31,8 +31,8 @@ const (
 var (
 	//DefaultKubernetesSpecConfig is the default Docker image source of Kubernetes
 	DefaultKubernetesSpecConfig = KubernetesSpecConfig{
-		KubernetesImageBase:              "k8s-gcrio.azureedge.net/",
-		TillerImageBase:                  "gcrio.azureedge.net/kubernetes-helm/",
+		KubernetesImageBase:              "k8s.gcr.io/",
+		TillerImageBase:                  "gcr.io/kubernetes-helm/",
 		ACIConnectorImageBase:            "microsoft/",
 		NVIDIAImageBase:                  "nvidia/",
 		AzureCNIImageBase:                "containernetworking/",

diff --git a/pkg/acsengine/engine.go b/pkg/acsengine/engine.go
@@ -147,7 +147,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 k8s-gcrio.azureedge.net/...
+//for example: if the target is the public azure, then the default container image url should be k8s.gcr.io/...
 //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) {

diff --git a/test/e2e/kubernetes/kubernetes_test.go b/test/e2e/kubernetes/kubernetes_test.go
@@ -533,7 +533,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
 				// Inspired by http://blog.kubernetes.io/2016/07/autoscaling-in-kubernetes.html
 				r := rand.New(rand.NewSource(time.Now().UnixNano()))
 				phpApacheName := fmt.Sprintf("php-apache-%s-%v", cfg.Name, r.Intn(99999))
-				phpApacheDeploy, err := deployment.CreateLinuxDeploy("k8s-gcrio.azureedge.net/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
+				phpApacheDeploy, err := deployment.CreateLinuxDeploy("k8s.gcr.io/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
 				if err != nil {
 					fmt.Println(err)
 				}

diff --git a/test/e2e/kubernetes/workloads/cuda-vector-add.yaml b/test/e2e/kubernetes/workloads/cuda-vector-add.yaml
@@ -10,4 +10,4 @@ spec:
       restartPolicy: Never
       containers:
       - name: cuda-vector-add
-        image: k8s-gcrio.azureedge.net/cuda-vector-add:v0.1
+        image: k8s.gcr.io/cuda-vector-add:v0.1