From d70a958616439eb7155ef42b9edf905a0d864932 Mon Sep 17 00:00:00 2001
From: DiamondYuan <541832074@qq.com>
Date: Tue, 19 Dec 2017 17:46:34 +0800
Subject: [PATCH] =?UTF-8?q?pause=E9=95=9C=E5=83=8F=E5=9C=B0=E5=9D=80=20?=
 =?UTF-8?q?=E5=8F=AF=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 example/hosts.allinone.example               | 3 +++
 example/hosts.m-masters.example              | 3 +++
 example/hosts.s-master.example               | 3 +++
 roles/kube-node/templates/kubelet.service.j2 | 2 +-
 4 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/example/hosts.allinone.example b/example/hosts.allinone.example
index ee8bd96..31aefff 100644
--- a/example/hosts.allinone.example
+++ b/example/hosts.allinone.example
@@ -26,6 +26,9 @@ MASTER_IP="192.168.1.1"
 #集群 APISERVER
 KUBE_APISERVER="https://192.168.1.1:6443"
 
+#pause镜像地址
+POD_INFRA_CONTAINER_IMAGE=mirrorgooglecontainers/pause-amd64:3.0
+
 #TLS Bootstrapping 使用的 Token，使用 head -c 16 /dev/urandom | od -An -t x | tr -d ' ' 生成
 BOOTSTRAP_TOKEN="d18f94b5fa585c7123f56803d925d2e7"
 
diff --git a/example/hosts.m-masters.example b/example/hosts.m-masters.example
index 1146048..2eb0b44 100644
--- a/example/hosts.m-masters.example
+++ b/example/hosts.m-masters.example
@@ -45,6 +45,9 @@ kube-master
 MASTER_IP="192.168.1.10"
 KUBE_APISERVER="https://192.168.1.10:8443"
 
+#pause镜像地址
+POD_INFRA_CONTAINER_IMAGE=mirrorgooglecontainers/pause-amd64:3.0
+
 #TLS Bootstrapping 使用的 Token，使用 head -c 16 /dev/urandom | od -An -t x | tr -d ' ' 生成
 BOOTSTRAP_TOKEN="c30302226d4b810e08731702d3890f50"
 
diff --git a/example/hosts.s-master.example b/example/hosts.s-master.example
index 35f9ac3..7e4cd50 100644
--- a/example/hosts.s-master.example
+++ b/example/hosts.s-master.example
@@ -30,6 +30,9 @@ MASTER_IP="192.168.1.1"
 #集群 APISERVER
 KUBE_APISERVER="https://192.168.1.1:6443"
 
+#pause镜像地址
+POD_INFRA_CONTAINER_IMAGE=mirrorgooglecontainers/pause-amd64:3.0
+
 #TLS Bootstrapping 使用的 Token，使用 head -c 16 /dev/urandom | od -An -t x | tr -d ' ' 生成
 BOOTSTRAP_TOKEN="d18f94b5fa585c7123f56803d925d2e7"
 
diff --git a/roles/kube-node/templates/kubelet.service.j2 b/roles/kube-node/templates/kubelet.service.j2
index af89192..b534c69 100644
--- a/roles/kube-node/templates/kubelet.service.j2
+++ b/roles/kube-node/templates/kubelet.service.j2
@@ -10,7 +10,7 @@ WorkingDirectory=/var/lib/kubelet
 ExecStart={{ bin_dir }}/kubelet \
   --address={{ NODE_IP }} \
   --hostname-override={{ NODE_IP }} \
-  --pod-infra-container-image=mirrorgooglecontainers/pause-amd64:3.0 \
+  --pod-infra-container-image={{ POD_INFRA_CONTAINER_IMAGE }} \
   --experimental-bootstrap-kubeconfig=/etc/kubernetes/bootstrap.kubeconfig \
   --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
   --cert-dir={{ ca_dir }} \