From b824f11c7e3794289ef3093b0e2fc8b9e74c2ef5 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 7 May 2021 01:38:36 +0200 Subject: renew containerd role --- inventory/host_vars/ch-equinox-t450s.yml | 1 + inventory/host_vars/ch-equinox-ws.yml | 1 + inventory/host_vars/ch-testvm-prometheus.yml | 11 ++++++++++- 3 files changed, 12 insertions(+), 1 deletion(-) (limited to 'inventory') diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml index 88e41297..c0b3acf3 100644 --- a/inventory/host_vars/ch-equinox-t450s.yml +++ b/inventory/host_vars/ch-equinox-t450s.yml @@ -182,6 +182,7 @@ ws_base_extra_packages: - python3-ruamel.yaml - python3-sphinx - python3-sphinx-rtd-theme + - python3-toml - qemu-kvm - qemu-utils - quilt diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index 7eb23678..c1663d30 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -179,6 +179,7 @@ ws_base_extra_packages: - python3-ruamel.yaml - python3-sphinx - python3-sphinx-rtd-theme + - python3-toml - qemu-kvm - qemu-utils - quilt diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index 597cd134..11dec61c 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -12,7 +12,7 @@ install: sda: type: zfs name: root - size: 5g + size: 50g interfaces: - bridge: br-svc name: svc0 @@ -31,3 +31,12 @@ network: gateway: "{{ network_zones.svc.prefix | ipaddr(network_zones.svc.offsets['ch-gw-lan']) | ipaddr('address') }}" interfaces: - *_network_primary_ + + + +containerd_storage: + type: lvm + vg: "{{ host_name }}" + lv: containerd + size: 20G + fs: ext4 -- cgit v1.2.3 From c1be7209e377f043ae567b1db3fb2add579b3235 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sat, 8 May 2021 00:16:13 +0200 Subject: standalone kubelets using containerd --- chaos-at-home/ch-testvm-prometheus.yml | 11 ++--------- inventory/host_vars/ch-testvm-prometheus.yml | 12 ++++++++++++ inventory/hosts.ini | 1 + roles/containerd/tasks/main.yml | 26 ++++++++++++-------------- roles/kubernetes/base/tasks/cri_containerd.yml | 15 +++++++++++++++ roles/kubernetes/base/tasks/cri_docker.yml | 12 ++++++++++-- 6 files changed, 52 insertions(+), 25 deletions(-) (limited to 'inventory') diff --git a/chaos-at-home/ch-testvm-prometheus.yml b/chaos-at-home/ch-testvm-prometheus.yml index 13a60198..a34d58e3 100644 --- a/chaos-at-home/ch-testvm-prometheus.yml +++ b/chaos-at-home/ch-testvm-prometheus.yml @@ -7,12 +7,5 @@ - role: core/sshd/base - role: core/zsh - role: core/ntp - - role: containerd - containerd_config: - plugins: - "io.containerd.grpc.v1.cri": - containerd: - runtimes: - runc: - options: - SystemdCgroup: true + - role: kubernetes/base + - role: kubernetes/standalone/base diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index 11dec61c..426a2c00 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -40,3 +40,15 @@ containerd_storage: lv: containerd size: 20G fs: ext4 + +kubelet_storage: + type: lvm + vg: "{{ host_name }}" + lv: kubelet + size: 15G + fs: ext4 + +kubernetes_version: 1.21.0 +kubernetes_container_runtime: containerd +kubernetes_standalone_max_pods: 42 +kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 4c31b999..8d03b7b1 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -457,6 +457,7 @@ glt-telesto glt-datacop glt-thetys sgg-icecast +ch-testvm-prometheus [kubernetes:children] kubernetes-cluster diff --git a/roles/containerd/tasks/main.yml b/roles/containerd/tasks/main.yml index b6a8d997..a082e27b 100644 --- a/roles/containerd/tasks/main.yml +++ b/roles/containerd/tasks/main.yml @@ -1,18 +1,4 @@ --- -- name: install containerd config - when: containerd_config is defined - block: - - name: create containerd config directory - file: - name: /etc/containerd - state: directory - - - name: install containerd config - copy: - content: "{{ containerd_config | to_toml }}\n" - dest: /etc/containerd/config.toml - notify: restart containerd - - name: prepare storage volume for /var/lib/containerd when: containerd_storage is defined vars: @@ -31,6 +17,18 @@ state: present force: yes +- name: fetch containerd default config + check_mode: no + command: containerd config default + register: containerd_config_default + changed_when: false + +- name: fetch containerd default config + copy: + content: "{{ containerd_config_default.stdout | from_toml | combine(containerd_config, recursive=True) | to_toml }}\n" + dest: /etc/containerd/config.toml + notify: restart containerd + - name: disable automatic upgrades for containerd package when: containerd_pkg_version is defined dpkg_selections: diff --git a/roles/kubernetes/base/tasks/cri_containerd.yml b/roles/kubernetes/base/tasks/cri_containerd.yml index 66398ef2..441360f7 100644 --- a/roles/kubernetes/base/tasks/cri_containerd.yml +++ b/roles/kubernetes/base/tasks/cri_containerd.yml @@ -5,6 +5,21 @@ that: - kubernetes_cri_socket == "unix:///run/containerd/containerd.sock" +- name: switch to systemd cgroup driver + set_fact: + containerd_config_override: + plugins: + "io.containerd.grpc.v1.cri": + containerd: + runtimes: + runc: + options: + SystemdCgroup: true + +- name: override mandatory settings in containerd_config + set_fact: + containerd_config: "{{ containerd_config | default({}) | combine(containerd_config_override, recursive=True) }}" + - 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 index 187d5893..88b35508 100644 --- a/roles/kubernetes/base/tasks/cri_docker.yml +++ b/roles/kubernetes/base/tasks/cri_docker.yml @@ -17,9 +17,17 @@ After=docker.service dest: /etc/systemd/system/kubelet.service.d/after-docker.conf -- name: disable bridge and iptables in docker daemon config +- name: disable bridge and iptables in docker daemon config and switch to systemd cgroup driver set_fact: - docker_daemon_config: "{{ docker_daemon_config | default({}) | combine({'exec-opts': ['native.cgroupdriver=systemd'], 'bridge': 'none', 'iptables': false}) }}" + docker_daemon_config_override: + exec-opts: + - "native.cgroupdriver=systemd" + bridge: "none" + iptables: false + +- name: override mandatory settings in docker_daemon_config + set_fact: + docker_daemon_config: "{{ docker_daemon_config | default({}) | combine(docker_daemon_config_override, recursive=True, list_merge='append') }}" - name: install docker include_role: -- cgit v1.2.3 From b1f78471044b255b16ac7a32ef3abbe019a442d6 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 May 2021 18:39:37 +0200 Subject: install podmand and buildah to ch-equinox-* --- chaos-at-home/ch-equinox-t450s.yml | 1 + chaos-at-home/ch-equinox-ws.yml | 1 + inventory/host_vars/ch-equinox-t450s.yml | 4 ++++ inventory/host_vars/ch-equinox-ws.yml | 4 ++++ 4 files changed, 10 insertions(+) (limited to 'inventory') diff --git a/chaos-at-home/ch-equinox-t450s.yml b/chaos-at-home/ch-equinox-t450s.yml index ed3d1c3a..389a39ed 100644 --- a/chaos-at-home/ch-equinox-t450s.yml +++ b/chaos-at-home/ch-equinox-t450s.yml @@ -10,6 +10,7 @@ - role: apt-repo/backports - role: apt-repo/spreadspace - role: apt-repo/tor-project + - role: apt-repo/github-containers - role: apt-repo/kubernetes - role: apt-repo/riot - role: apt-repo/nordvpn diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml index d872ca85..f5cbd4cf 100644 --- a/chaos-at-home/ch-equinox-ws.yml +++ b/chaos-at-home/ch-equinox-ws.yml @@ -11,6 +11,7 @@ - role: apt-repo/backports - role: apt-repo/spreadspace - role: apt-repo/tor-project + - role: apt-repo/github-containers - role: apt-repo/kubernetes - role: apt-repo/riot - role: ws/base diff --git a/inventory/host_vars/ch-equinox-t450s.yml b/inventory/host_vars/ch-equinox-t450s.yml index c0b3acf3..28ac168c 100644 --- a/inventory/host_vars/ch-equinox-t450s.yml +++ b/inventory/host_vars/ch-equinox-t450s.yml @@ -241,6 +241,10 @@ ws_base_extra_packages: # needs apt-repo/tor-project - tor - tor-geoipdb + # needs apt-repo/github-containers + - buildah + - containernetworking-plugins + - podman # needs apt-repo/kubernetes - kubectl # needs apt-repo/riot diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml index c1663d30..ffb12845 100644 --- a/inventory/host_vars/ch-equinox-ws.yml +++ b/inventory/host_vars/ch-equinox-ws.yml @@ -240,6 +240,10 @@ ws_base_extra_packages: # needs apt-repo/tor-project - tor - tor-geoipdb + # needs apt-repo/github-containers + - buildah + - containernetworking-plugins + - podman # needs apt-repo/kubernetes - kubectl # needs apt-repo/riot -- cgit v1.2.3 From e5f570adb8a8f5e3fa8884d056f1d8df7795dbf1 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 9 May 2021 18:49:52 +0200 Subject: bump kubernetes version for most standalone kubelets --- inventory/host_vars/ch-testvm-prometheus.yml | 2 +- inventory/host_vars/ch-thetys.yml | 2 +- inventory/host_vars/ele-thetys.yml | 2 +- inventory/host_vars/glt-calypso.yml | 2 +- inventory/host_vars/glt-coturn.yml | 2 +- inventory/host_vars/glt-datacop.yml | 2 +- inventory/host_vars/glt-dione.yml | 2 +- inventory/host_vars/glt-helene.yml | 2 +- inventory/host_vars/glt-jitsi.yml | 2 +- inventory/host_vars/glt-telesto.yml | 2 +- inventory/host_vars/glt-thetys.yml | 2 +- inventory/host_vars/lw-thetys.yml | 2 +- inventory/host_vars/s2-thetys.yml | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) (limited to 'inventory') diff --git a/inventory/host_vars/ch-testvm-prometheus.yml b/inventory/host_vars/ch-testvm-prometheus.yml index 426a2c00..d11d565c 100644 --- a/inventory/host_vars/ch-testvm-prometheus.yml +++ b/inventory/host_vars/ch-testvm-prometheus.yml @@ -48,7 +48,7 @@ kubelet_storage: size: 15G fs: ext4 -kubernetes_version: 1.21.0 +kubernetes_version: 1.21.1 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-thetys.yml b/inventory/host_vars/ch-thetys.yml index 5ebc387a..77e9470c 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -47,7 +47,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 73807915..7901beda 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -42,7 +42,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-calypso.yml b/inventory/host_vars/glt-calypso.yml index 3f6a42dd..bdd377cc 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -72,7 +72,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-coturn.yml b/inventory/host_vars/glt-coturn.yml index f3f814d0..f598384d 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -13,7 +13,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/glt-datacop.yml b/inventory/host_vars/glt-datacop.yml index 47982c29..e66eba05 100644 --- a/inventory/host_vars/glt-datacop.yml +++ b/inventory/host_vars/glt-datacop.yml @@ -67,7 +67,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-dione.yml b/inventory/host_vars/glt-dione.yml index 4e41ef41..c860d301 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -62,7 +62,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-helene.yml b/inventory/host_vars/glt-helene.yml index 4a927036..c016b0a7 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -62,7 +62,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-jitsi.yml b/inventory/host_vars/glt-jitsi.yml index 15a27ffb..966f3a74 100644 --- a/inventory/host_vars/glt-jitsi.yml +++ b/inventory/host_vars/glt-jitsi.yml @@ -13,7 +13,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/glt-telesto.yml b/inventory/host_vars/glt-telesto.yml index ed38a7b2..3ce9154c 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -72,7 +72,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-thetys.yml b/inventory/host_vars/glt-thetys.yml index a80ebabe..51aaee89 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -67,7 +67,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/lw-thetys.yml b/inventory/host_vars/lw-thetys.yml index 2c5d998c..706557f7 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -43,7 +43,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index de2afaa5..957abfb0 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -49,7 +49,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.20.5 +kubernetes_version: 1.21.1 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap -- cgit v1.2.3