增加 pod-infra-container 可选择配置

zhxiaom5 · Jan 10, 2019 · edd68c7 · edd68c7
1 parent a1be546
commit edd68c7
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/roles/kube-node/defaults/main.yml b/roles/kube-node/defaults/main.yml
@@ -1,6 +1,10 @@
 # 默认使用kube-proxy的 'iptables' 模式，可选 'ipvs' 模式(experimental)
 PROXY_MODE: "iptables"
 
+# 基础容器镜像
+SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1"
+#SANDBOX_IMAGE: "registry.access.redhat.com/rhel7/pod-infrastructure:latest"
+
 # Kubelet 根目录
 KUBELET_ROOT_DIR: "/var/lib/kubelet"
 

diff --git a/roles/kube-node/templates/kubelet.service.j2 b/roles/kube-node/templates/kubelet.service.j2
@@ -6,7 +6,6 @@ Requires=docker.service
 
 [Service]
 WorkingDirectory=/var/lib/kubelet
-#--pod-infra-container-image=registry.access.redhat.com/rhel7/pod-infrastructure:latest
 ExecStart={{ bin_dir }}/kubelet \
   --address={{ inventory_hostname }} \
   --allow-privileged=true \
@@ -24,7 +23,7 @@ ExecStart={{ bin_dir }}/kubelet \
   --kubeconfig=/etc/kubernetes/kubelet.kubeconfig \
   --max-pods={{ MAX_PODS }} \
   --network-plugin=cni \
-  --pod-infra-container-image=mirrorgooglecontainers/pause-amd64:3.1 \
+  --pod-infra-container-image={{ SANDBOX_IMAGE }} \
   --register-node=true \
   --root-dir={{ KUBELET_ROOT_DIR }} \
   --tls-cert-file={{ ca_dir }}/kubelet.pem \