From 949ff8a513464f107ebd2c474078b452e129acf3 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 11 Jan 2020 01:35:42 +0100 Subject: kubernetes: major refactoring of kubernetes playbook structure --- roles/kubernetes/base/tasks/cri_containerd.yml | 4 ++++ roles/kubernetes/base/tasks/cri_docker.yml | 8 ++++++++ roles/kubernetes/base/tasks/main.yml | 3 +++ 3 files changed, 15 insertions(+) create mode 100644 roles/kubernetes/base/tasks/cri_containerd.yml create mode 100644 roles/kubernetes/base/tasks/cri_docker.yml (limited to 'roles/kubernetes/base/tasks') diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml new file mode 100644 index 00000000..aa34e6fe --- /dev/null +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -0,0 +1,4 @@ +--- +- name: install containerd + include_role: + name: containerd diff --git a/roles/kubernetes/base/tasks/cri_docker.yml b/roles/kubernetes/base/tasks/cri_docker.yml new file mode 100644 index 00000000..67196f51 --- /dev/null +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -0,0 +1,8 @@ +--- +- name: disable bridge and iptables in docker daemon config + set_fact: + docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'bridge': 'none', 'iptables': false}) }}" + +- name: install docker + include_role: + name: docker diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index 9c91e347..c3ab1c02 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -1,4 +1,7 @@ --- +- name: install container runtime + include_tasks: "cri_{{ kubernetes_container_runtime }}.yml" + - name: prepare /var/lib/kubelet as LVM when: kubelet_lvm is defined import_tasks: lvm.yml -- cgit v1.2.3 From e121406963976aed4dbeadee4adc3e8195a90e36 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 31 Jan 2020 23:53:33 +0100 Subject: kubernetes standalone with docker --- dan/ele-thetys.yml | 3 ++- inventory/host_vars/ele-thetys.yml | 11 +++++++++++ roles/kubernetes/base/tasks/main.yml | 4 ++-- .../standalone/templates/kubelet.service.override.j2 | 1 + 4 files changed, 16 insertions(+), 3 deletions(-) (limited to 'roles/kubernetes/base/tasks') diff --git a/dan/ele-thetys.yml b/dan/ele-thetys.yml index eca748e9..4024989d 100644 --- a/dan/ele-thetys.yml +++ b/dan/ele-thetys.yml @@ -8,4 +8,5 @@ - role: admin-user - role: blackmagic-desktopvideo - role: apt-repo/spreadspace - - role: docker + - role: kubernetes/base + - role: kubernetes/standalone diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 5740b206..51dcf1a0 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -28,3 +28,14 @@ docker_lvm: lv: docker size: 10G fs: ext4 + +kubelet_lvm: + vg: "{{ host_name }}" + lv: kubelet + size: 5G + fs: ext4 + +kubernetes_version: 1.17.2 +kubernetes_container_runtime: docker +kubernetes_standalone_max_pods: 42 +kubernetes_standalone_cni_variant: with-portmap diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index c3ab1c02..f1802b0c 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -69,11 +69,11 @@ - name: add dummy group with gid 998 group: name: app - gid: 998 + gid: 990 - name: add dummy user with uid 998 user: name: app - uid: 998 + uid: 990 group: app password: "!" diff --git a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/templates/kubelet.service.override.j2 index 3a88ccd2..75061e73 100644 --- a/roles/kubernetes/standalone/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/templates/kubelet.service.override.j2 @@ -6,4 +6,5 @@ ExecStart=/usr/bin/kubelet \ --container-runtime=remote \ --container-runtime-endpoint=unix:///run/containerd/containerd.sock \ {% endif %} + --network-plugin=cni \ --cloud-provider= -- cgit v1.2.3