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

Commit f95af89

Browse files
jackfrancisjackfrancis
committed
retire Azure CDN for container image repository proxying (#3535)
1 parent b272457 commit f95af89

File tree

11 files changed

+28
-28
lines changed

11 files changed

+28
-28
lines changed

‎docs/clusterdefinition.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Here are the valid values for the orchestrator types:
5252
| 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/) |
5353
| 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/) |
5454
| kubeletConfig | no | Configure various runtime configuration for kubelet. See `kubeletConfig` [below](#feat-kubelet-config) |
55-
| 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/` |
55+
| 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/` |
5656
| 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 |
5757
| 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. |
5858
| privateCluster | no | Build a cluster without public addresses assigned. See `privateClusters` [below](#feat-private-cluster). |

‎docs/kubernetes/k8s-developers.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ cd ../../..
2323
* Push your Docker image to Docker Hub:
2424

2525
```
26-
docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
26+
docker tag k8s.gcr.io/hyperkube-amd64:sometag dockerhubid/hyperkube-amd64:sometag
2727
docker push dockerhubid/hyperkube-amd64:sometag
2828
```
2929

‎examples/addons/cluster-autoscaler/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ Follow the README at https://github.com/kubernetes/autoscaler/tree/master/cluste
7777
| minNodes | no | minimum node count | 1 |
7878
| maxNodes | no | maximum node count | 5 |
7979
| name | no | container name | "cluster-autoscaler" |
80-
| image | no | image | "gcrio.azureedge.net/google-containers/cluster-autoscaler" |
80+
| image | no | image | "gcr.io/google-containers/cluster-autoscaler" |
8181
| cpuRequests | no | cpu requests for the container | "100m" |
8282
| memoryRequests | no | memory requests for the container | "300Mi" |
8383
| cpuLimits | no | cpu limits for the container | "100m" |

‎examples/scale-up/kubernetes_orignal_params.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,31 +45,31 @@
4545
"value": ""
4646
},
4747
"kubernetesAddonManagerSpec": {
48-
"value": "k8s-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
48+
"value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
4949
},
5050
"kubernetesAddonResizerSpec": {
51-
"value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
51+
"value": "k8s.gcr.io/addon-resizer:1.6"
5252
},
5353
"kubernetesDNSMasqSpec": {
54-
"value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
54+
"value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
5555
},
5656
"kubernetesDashboardSpec": {
57-
"value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
57+
"value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
5858
},
5959
"kubernetesExecHealthzSpec": {
60-
"value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
60+
"value": "k8s.gcr.io/exechealthz-amd64:1.2"
6161
},
6262
"kubernetesHeapsterSpec": {
63-
"value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
63+
"value": "k8s.gcr.io/heapster:v1.2.0"
6464
},
6565
"kubernetesHyperkubeSpec": {
66-
"value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.6.13"
66+
"value": "k8s.gcr.io/hyperkube-amd64:v1.6.13"
6767
},
6868
"kubernetesKubeDNSSpec": {
69-
"value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
69+
"value": "k8s.gcr.io/kubedns-amd64:1.7"
7070
},
7171
"kubernetesPodInfraContainerSpec": {
72-
"value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
72+
"value": "k8s.gcr.io/pause-amd64:3.0"
7373
},
7474
"linuxAdminUsername": {
7575
"value": "azureuser"

‎examples/scale-up/kubernetes_scale_up_params.json‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,31 +51,31 @@
5151
"value": ""
5252
},
5353
"kubernetesAddonManagerSpec": {
54-
"value": "k8s-gcrio.azureedge.net/kube-addon-manager-amd64:v6.2"
54+
"value": "k8s.gcr.io/kube-addon-manager-amd64:v6.2"
5555
},
5656
"kubernetesAddonResizerSpec": {
57-
"value": "k8s-gcrio.azureedge.net/addon-resizer:1.6"
57+
"value": "k8s.gcr.io/addon-resizer:1.6"
5858
},
5959
"kubernetesDNSMasqSpec": {
60-
"value": "k8s-gcrio.azureedge.net/kube-dnsmasq-amd64:1.3"
60+
"value": "k8s.gcr.io/kube-dnsmasq-amd64:1.3"
6161
},
6262
"kubernetesDashboardSpec": {
63-
"value": "k8s-gcrio.azureedge.net/kubernetes-dashboard-amd64:v1.5.1"
63+
"value": "k8s.gcr.io/kubernetes-dashboard-amd64:v1.5.1"
6464
},
6565
"kubernetesExecHealthzSpec": {
66-
"value": "k8s-gcrio.azureedge.net/exechealthz-amd64:1.2"
66+
"value": "k8s.gcr.io/exechealthz-amd64:1.2"
6767
},
6868
"kubernetesHeapsterSpec": {
69-
"value": "k8s-gcrio.azureedge.net/heapster:v1.2.0"
69+
"value": "k8s.gcr.io/heapster:v1.2.0"
7070
},
7171
"kubernetesHyperkubeSpec": {
72-
"value": "k8s-gcrio.azureedge.net/hyperkube-amd64:v1.6.13"
72+
"value": "k8s.gcr.io/hyperkube-amd64:v1.6.13"
7373
},
7474
"kubernetesKubeDNSSpec": {
75-
"value": "k8s-gcrio.azureedge.net/kubedns-amd64:1.7"
75+
"value": "k8s.gcr.io/kubedns-amd64:1.7"
7676
},
7777
"kubernetesPodInfraContainerSpec": {
78-
"value": "k8s-gcrio.azureedge.net/pause-amd64:3.0"
78+
"value": "k8s.gcr.io/pause-amd64:3.0"
7979
},
8080
"linuxAdminUsername": {
8181
"value": "azureuser"

‎extensions/prometheus-grafana-k8s/v1/prometheus_values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ kubeStateMetrics:
194194
## kube-state-metrics container image
195195
##
196196
image:
197-
repository: k8s-gcrio.azureedge.net/kube-state-metrics
197+
repository: k8s.gcr.io/kube-state-metrics
198198
tag: v1.2.0
199199
pullPolicy: IfNotPresent
200200

‎jenkins/Jenkinsfile.azure.kubernetes‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ node(env.NODE? env.NODE : 'slave') {
5555
sh("docker login -u ${REGISTRY_USERNAME} -p ${REGISTRY_PASSWORD} ${REGISTRY_USERNAME}.azurecr.io")
5656

5757
// We retag the gcr image from hyperkube-amd64 to just hyperkube since we can use image tags for separate architectures
58-
sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag k8s-gcrio.azureedge.net/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
58+
sh("cd /go/src/github.com/kubernetes/kubernetes && docker tag k8s.gcr.io/hyperkube-amd64:${tag} ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
5959
sh("cd /go/src/github.com/kubernetes/kubernetes && docker push ${REGISTRY_USERNAME}.azurecr.io/hyperkube:${tag}")
6060
}
6161
}

‎pkg/acsengine/defaults.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ const (
3131
var (
3232
//DefaultKubernetesSpecConfig is the default Docker image source of Kubernetes
3333
DefaultKubernetesSpecConfig = KubernetesSpecConfig{
34-
KubernetesImageBase: "k8s-gcrio.azureedge.net/",
35-
TillerImageBase: "gcrio.azureedge.net/kubernetes-helm/",
34+
KubernetesImageBase: "k8s.gcr.io/",
35+
TillerImageBase: "gcr.io/kubernetes-helm/",
3636
ACIConnectorImageBase: "microsoft/",
3737
NVIDIAImageBase: "nvidia/",
3838
AzureCNIImageBase: "containernetworking/",

‎pkg/acsengine/engine.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ func FormatAzureProdFQDN(fqdnPrefix string, location string) string {
147147
}
148148

149149
//getCloudSpecConfig returns the kubenernetes container images url configurations based on the deploy target environment
150-
//for example: if the target is the public azure, then the default container image url should be k8s-gcrio.azureedge.net/...
150+
//for example: if the target is the public azure, then the default container image url should be k8s.gcr.io/...
151151
//if the target is azure china, then the default container image should be mirror.azure.cn:5000/google_container/...
152152
func getCloudSpecConfig(location string) AzureEnvironmentSpecConfig {
153153
switch getCloudTargetEnv(location) {

‎test/e2e/kubernetes/kubernetes_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -533,7 +533,7 @@ var _ = Describe("Azure Container Cluster using the Kubernetes Orchestrator", fu
533533
// Inspired by http://blog.kubernetes.io/2016/07/autoscaling-in-kubernetes.html
534534
r := rand.New(rand.NewSource(time.Now().UnixNano()))
535535
phpApacheName := fmt.Sprintf("php-apache-%s-%v", cfg.Name, r.Intn(99999))
536-
phpApacheDeploy, err := deployment.CreateLinuxDeploy("k8s-gcrio.azureedge.net/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
536+
phpApacheDeploy, err := deployment.CreateLinuxDeploy("k8s.gcr.io/hpa-example", phpApacheName, "default", "--requests=cpu=50m,memory=50M")
537537
if err != nil {
538538
fmt.Println(err)
539539
}

0 commit comments

Comments
 (0)