From 6b08bde4798630c0ad9134dd73d412b03302494e Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sun, 8 Apr 2018 12:16:29 -0700 Subject: [PATCH] Use k8s.gcr.io instead of gcr.io/google_containers * Kubernetes recommends using the alias to fetch images from the nearest GCR regional mirror, to abstract the use of GCR, and to drop names containing 'google' * https://groups.google.com/forum/#!msg/kubernetes-dev/ytjk_rNrTa0/3EFUHvovCAAJ --- CHANGES.md | 2 ++ addons/nginx-ingress/aws/default-backend/deployment.yaml | 2 +- .../digital-ocean/default-backend/deployment.yaml | 2 +- .../google-cloud/default-backend/deployment.yaml | 2 +- .../prometheus/exporters/kube-state-metrics/deployment.yaml | 2 +- aws/container-linux/kubernetes/bootkube.tf | 2 +- aws/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- bare-metal/container-linux/kubernetes/bootkube.tf | 2 +- bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl | 2 +- digital-ocean/container-linux/kubernetes/bootkube.tf | 2 +- .../container-linux/kubernetes/cl/controller.yaml.tmpl | 2 +- digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl | 4 ++-- google-cloud/container-linux/kubernetes/bootkube.tf | 2 +- .../kubernetes/controllers/cl/controller.yaml.tmpl | 2 +- .../container-linux/kubernetes/workers/cl/worker.yaml.tmpl | 4 ++-- 17 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index deca40bc..b65f8b22 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,8 @@ Notable changes between versions. ## Latest * Enable etcd v3.3 metrics endpoint ([#175](https://github.com/poseidon/typhoon/pull/175)) +* Use `k8s.gcr.io` instead of `gcr.io/google_containers` + * Kubernetes [recommends](https://groups.google.com/forum/#!msg/kubernetes-dev/ytjk_rNrTa0/3EFUHvovCAAJ) using the alias to pull from the nearest regional mirror and to abstract the backing container registry * Update kube-dns from v1.14.8 to v1.14.9 * Update etcd from v3.3.2 to v3.3.3 diff --git a/addons/nginx-ingress/aws/default-backend/deployment.yaml b/addons/nginx-ingress/aws/default-backend/deployment.yaml index 4f5b3b8e..786968e0 100644 --- a/addons/nginx-ingress/aws/default-backend/deployment.yaml +++ b/addons/nginx-ingress/aws/default-backend/deployment.yaml @@ -20,7 +20,7 @@ spec: # Any image is permissable as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.4 + image: k8s.gcr.io/defaultbackend:1.4 ports: - containerPort: 8080 resources: diff --git a/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml b/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml index 4f5b3b8e..786968e0 100644 --- a/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml +++ b/addons/nginx-ingress/digital-ocean/default-backend/deployment.yaml @@ -20,7 +20,7 @@ spec: # Any image is permissable as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.4 + image: k8s.gcr.io/defaultbackend:1.4 ports: - containerPort: 8080 resources: diff --git a/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml b/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml index 4f5b3b8e..786968e0 100644 --- a/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml +++ b/addons/nginx-ingress/google-cloud/default-backend/deployment.yaml @@ -20,7 +20,7 @@ spec: # Any image is permissable as long as: # 1. It serves a 404 page at / # 2. It serves 200 on a /healthz endpoint - image: gcr.io/google_containers/defaultbackend:1.4 + image: k8s.gcr.io/defaultbackend:1.4 ports: - containerPort: 8080 resources: diff --git a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml index 546d8d61..6cae3b0b 100644 --- a/addons/prometheus/exporters/kube-state-metrics/deployment.yaml +++ b/addons/prometheus/exporters/kube-state-metrics/deployment.yaml @@ -33,7 +33,7 @@ spec: initialDelaySeconds: 5 timeoutSeconds: 5 - name: addon-resizer - image: gcr.io/google_containers/addon-resizer:1.7 + image: k8s.gcr.io/addon-resizer:1.7 resources: limits: cpu: 100m diff --git a/aws/container-linux/kubernetes/bootkube.tf b/aws/container-linux/kubernetes/bootkube.tf index 47ec5afb..e16b6333 100644 --- a/aws/container-linux/kubernetes/bootkube.tf +++ b/aws/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=b408d80c593cef46aac49bd98c02dac9c7d7b7d8" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl index c687759e..33abc4e9 100644 --- a/aws/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/aws/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -117,7 +117,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root diff --git a/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index e41a215b..b4947f08 100644 --- a/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/aws/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -89,7 +89,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root @@ -108,7 +108,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://gcr.io/google_containers/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/bare-metal/container-linux/kubernetes/bootkube.tf b/bare-metal/container-linux/kubernetes/bootkube.tf index 4d820755..8eb05911 100644 --- a/bare-metal/container-linux/kubernetes/bootkube.tf +++ b/bare-metal/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=b408d80c593cef46aac49bd98c02dac9c7d7b7d8" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" cluster_name = "${var.cluster_name}" api_servers = ["${var.k8s_domain_name}"] diff --git a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl index 7363ebd1..ef672843 100644 --- a/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -118,7 +118,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/hostname filesystem: root diff --git a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl index 0a530c95..6a323497 100644 --- a/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/bare-metal/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -81,7 +81,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/hostname filesystem: root diff --git a/digital-ocean/container-linux/kubernetes/bootkube.tf b/digital-ocean/container-linux/kubernetes/bootkube.tf index 028482c2..6363ec73 100644 --- a/digital-ocean/container-linux/kubernetes/bootkube.tf +++ b/digital-ocean/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=b408d80c593cef46aac49bd98c02dac9c7d7b7d8" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl index 3a4933e8..ef928b73 100644 --- a/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/controller.yaml.tmpl @@ -123,7 +123,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root diff --git a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl index 857d508f..4c9a3323 100644 --- a/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl +++ b/digital-ocean/container-linux/kubernetes/cl/worker.yaml.tmpl @@ -95,7 +95,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root @@ -114,7 +114,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://gcr.io/google_containers/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname) diff --git a/google-cloud/container-linux/kubernetes/bootkube.tf b/google-cloud/container-linux/kubernetes/bootkube.tf index cb98ea94..eed49493 100644 --- a/google-cloud/container-linux/kubernetes/bootkube.tf +++ b/google-cloud/container-linux/kubernetes/bootkube.tf @@ -1,6 +1,6 @@ # Self-hosted Kubernetes assets (kubeconfig, manifests) module "bootkube" { - source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=b408d80c593cef46aac49bd98c02dac9c7d7b7d8" + source = "git::https://github.com/poseidon/terraform-render-bootkube.git?ref=33e00a6dc5cdf2744b0f607329c1566ae8e5fde9" cluster_name = "${var.cluster_name}" api_servers = ["${format("%s.%s", var.cluster_name, var.dns_zone)}"] diff --git a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl index 0e6f9c88..4f9f52c0 100644 --- a/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/controllers/cl/controller.yaml.tmpl @@ -118,7 +118,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root diff --git a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl index bc722d59..4a1128ea 100644 --- a/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl +++ b/google-cloud/container-linux/kubernetes/workers/cl/worker.yaml.tmpl @@ -90,7 +90,7 @@ storage: mode: 0644 contents: inline: | - KUBELET_IMAGE_URL=docker://gcr.io/google_containers/hyperkube + KUBELET_IMAGE_URL=docker://k8s.gcr.io/hyperkube KUBELET_IMAGE_TAG=v1.10.0 - path: /etc/sysctl.d/max-user-watches.conf filesystem: root @@ -109,7 +109,7 @@ storage: --volume config,kind=host,source=/etc/kubernetes \ --mount volume=config,target=/etc/kubernetes \ --insecure-options=image \ - docker://gcr.io/google_containers/hyperkube:v1.10.0 \ + docker://k8s.gcr.io/hyperkube:v1.10.0 \ --net=host \ --dns=host \ --exec=/kubectl -- --kubeconfig=/etc/kubernetes/kubeconfig delete node $(hostname)