github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #277 from Random-Liu/add-ip-forward

Browse Source 
Add net.ipv4.ip_forward=1 and use ansible sysctl.
This commit is contained in:
Lantao Liu 2017-09-22 17:10:03 -07:00 committed by GitHub
commit b15172faea
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
contrib/ansible/cri-containerd.yaml
View File

@ -17,13 +17,14 @@
systemd: name=cri-containerd daemon_reload=yes state=started enabled=yes systemd: name=cri-containerd daemon_reload=yes state=started enabled=yes
- name: "Set bridge-nf-call-iptables" - name: "Set bridge-nf-call-iptables"
lineinfile: sysctl:
line: "net/bridge/bridge-nf-call-iptables = 1" name: net.bridge.bridge-nf-call-iptables
dest: /etc/sysctl.conf value: 1
insertafter: 'EOF'
regexp: '\/net\/bridge\/bridge-nf-call-iptables = 1' - name: "Set ip_forward"
state: present sysctl:
ignore_errors: true name: net.ipv4.ip_forward
value: 1
- name: "Check kubelet args in kubelet config" - name: "Check kubelet args in kubelet config"
shell: grep "^Environment=\"KUBELET_EXTRA_ARGS=" /etc/systemd/system/kubelet.service.d/10-kubeadm.conf shell: grep "^Environment=\"KUBELET_EXTRA_ARGS=" /etc/systemd/system/kubelet.service.d/10-kubeadm.conf
@ -32,9 +33,9 @@
- name: "Add runtime args in kubelet conf" - name: "Add runtime args in kubelet conf"
lineinfile: lineinfile:
dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf" dest: "/etc/systemd/system/kubelet.service.d/10-kubeadm.conf"
line: "Environment=\"KUBELET_EXTRA_ARGS= --container-runtime=remote --runtime-request-timeout=15m --image-service-endpoint=/var/run/cri-containerd.sock --container-runtime-endpoint=/var/run/cri-containerd.sock\"" line: "Environment=\"KUBELET_EXTRA_ARGS= --container-runtime=remote --runtime-request-timeout=15m --image-service-endpoint=/var/run/cri-containerd.sock --container-runtime-endpoint=/var/run/cri-containerd.sock\""
insertafter: '\[Service\]' insertafter: '\[Service\]'
when: check_args.stdout == "" when: check_args.stdout == ""
- name: "Start Kubelet" - name: "Start Kubelet"
@ -43,6 +44,6 @@
# TODO This needs to be removed once we have consistent concurrent pull results # TODO This needs to be removed once we have consistent concurrent pull results
- name: "Pre-pull pause container image" - name: "Pre-pull pause container image"
shell: | shell: |
/usr/local/bin/ctr pull gcr.io/google_containers/pause:3.0 /usr/local/bin/ctr pull gcr.io/google_containers/pause:3.0
/usr/local/bin/crictl --runtime-endpoint /var/run/cri-containerd.sock \ /usr/local/bin/crictl --runtime-endpoint /var/run/cri-containerd.sock \
pull gcr.io/google_containers/pause:3.0 pull gcr.io/google_containers/pause:3.0