From be3b7e090a6c5766c61c117c8954083f04fe20ce Mon Sep 17 00:00:00 2001
From: gjmzj <gaojianming.zj@139.com>
Date: Sat, 18 May 2019 22:44:23 +0800
Subject: [PATCH] update containerd/docker registry mirror settings

---
 roles/containerd/defaults/main.yml        |  5 -----
 roles/containerd/tasks/main.yml           |  7 +++++++
 roles/containerd/templates/config.toml.j2 | 21 ++++++++++++++++++---
 roles/docker/defaults/main.yml            |  6 ------
 roles/docker/templates/daemon.json.j2     |  5 ++---
 5 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/roles/containerd/defaults/main.yml b/roles/containerd/defaults/main.yml
index b81df10..1fde1dd 100644
--- a/roles/containerd/defaults/main.yml
+++ b/roles/containerd/defaults/main.yml
@@ -3,8 +3,3 @@ STORAGE_DIR: "/var/lib/containerd"
 
 # 基础容器镜像
 SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1"
-
-# 国内镜像加速
-REG_MIRRORS:
-  - "https://dockerhub.azk8s.cn"
-  - "https://docker.mirrors.ustc.edu.cn"
diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml
index 646d448..ecfbaae 100644
--- a/roles/containerd/tasks/main.yml
+++ b/roles/containerd/tasks/main.yml
@@ -54,3 +54,10 @@
   retries: 8
   delay: 2
   tags: upgrade
+
+- name: 添加 crictl 命令自动补全
+  lineinfile:
+    dest: ~/.bashrc
+    state: present
+    regexp: 'crictl completion'
+    line: 'source <(crictl completion)'
diff --git a/roles/containerd/templates/config.toml.j2 b/roles/containerd/templates/config.toml.j2
index a76e707..7709c34 100644
--- a/roles/containerd/templates/config.toml.j2
+++ b/roles/containerd/templates/config.toml.j2
@@ -51,13 +51,28 @@ oom_score = 0
       conf_template = ""
     [plugins.cri.registry]
       [plugins.cri.registry.mirrors]
+        # reference from https://www.ilanni.com/?p=14534
         [plugins.cri.registry.mirrors."docker.io"]
           endpoint = [
-{% for SITE in REG_MIRRORS %}
-            "{{ SITE }}",
-{% endfor %}
+            "https://dockerhub.azk8s.cn",
+            "https://docker.mirrors.ustc.edu.cn",
             "http://hub-mirror.c.163.com"
           ]
+        [plugins.cri.registry.mirrors."gcr.io"]
+          endpoint = [
+            "https://gcr.azk8s.cn",
+            "https://gcr.mirrors.ustc.edu.cn"
+          ]
+        [plugins.cri.registry.mirrors."k8s.gcr.io"]
+          endpoint = [
+            "https://gcr.azk8s.cn/google-containers/",
+            "https://gcr.mirrors.ustc.edu.cn/google-containers/"
+          ]
+        [plugins.cri.registry.mirrors."quay.io"]
+          endpoint = [
+            "https://quay.azk8s.cn",
+            "https://quay.mirrors.ustc.edu.cn"
+          ]
     [plugins.cri.x509_key_pair_streaming]
       tls_cert_file = ""
       tls_key_file = ""
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 3308668..479957d 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1,9 +1,3 @@
-# 国内镜像加速
-
-REG_MIRRORS:
-  - "https://dockerhub.azk8s.cn"
-  - "https://docker.mirrors.ustc.edu.cn"
-
 # docker日志相关
 
 LOG_DRIVER: "json-file"
diff --git a/roles/docker/templates/daemon.json.j2 b/roles/docker/templates/daemon.json.j2
index c041ad5..f1418bf 100644
--- a/roles/docker/templates/daemon.json.j2
+++ b/roles/docker/templates/daemon.json.j2
@@ -1,8 +1,7 @@
 {
   "registry-mirrors": [
-{% for SITE in REG_MIRRORS %}
-    "{{ SITE }}",
-{% endfor %}
+    "https://dockerhub.azk8s.cn",
+    "https://docker.mirrors.ustc.edu.cn",
     "http://hub-mirror.c.163.com"
   ],
   "max-concurrent-downloads": 10,