easzlab
/
kubeasz
mirror of https://github.com/easzlab/kubeasz.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

pull/440/head
gjmzj 2019-01-10 23:51:50 +08:00
parent a1be5462ed
commit edd68c7f47
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/kube-node/defaults/main.yml
View File

@ -1,6 +1,10 @@
# 默认使用kube-proxy的 'iptables' 模式，可选 'ipvs' 模式(experimental) # 默认使用kube-proxy的 'iptables' 模式，可选 'ipvs' 模式(experimental)
PROXY_MODE: "iptables" PROXY_MODE: "iptables"
# 基础容器镜像
SANDBOX_IMAGE: "mirrorgooglecontainers/pause-amd64:3.1"
#SANDBOX_IMAGE: "registry.access.redhat.com/rhel7/pod-infrastructure:latest"
# Kubelet 根目录 # Kubelet 根目录
KUBELET_ROOT_DIR: "/var/lib/kubelet" KUBELET_ROOT_DIR: "/var/lib/kubelet"

3
roles/kube-node/templates/kubelet.service.j2
View File

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