From 868f6e961d707299d6de8b3abfaa6ed46e25ff72 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Tue, 11 Jan 2022 13:34:29 +0100 Subject: kubernetes: switch to cri-tools from spreadspace repo --- inventory/host_vars/ch-dione.yml | 6 ++++-- inventory/host_vars/ch-helene.yml | 8 +++++--- inventory/host_vars/ch-thetys.yml | 4 +++- inventory/host_vars/ele-coturn.yml | 5 ++++- inventory/host_vars/ele-jitsi.yml | 5 ++++- inventory/host_vars/ele-thetys.yml | 7 +++++-- inventory/host_vars/glt-calypso.yml | 4 +++- inventory/host_vars/glt-coturn.yml | 6 +++++- inventory/host_vars/glt-dione.yml | 5 ++++- inventory/host_vars/glt-helene.yml | 5 ++++- inventory/host_vars/glt-jitsi.yml | 7 ++++++- inventory/host_vars/glt-telesto.yml | 4 +++- inventory/host_vars/glt-thetys.yml | 5 ++++- inventory/host_vars/glt-tsdatacop.yml | 5 ++++- inventory/host_vars/lw-thetys.yml | 6 +++++- inventory/host_vars/s2-thetys.yml | 5 ++++- inventory/host_vars/sgg-icecast.yml | 6 ++++-- roles/kubernetes/base/defaults/main.yml | 2 +- roles/kubernetes/base/tasks/main.yml | 11 +++++++---- 19 files changed, 79 insertions(+), 27 deletions(-) diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 93a94476..a4e95d44 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + admin_users_host: - equinox @@ -80,8 +83,7 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: containerd kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-helene.yml b/inventory/host_vars/ch-helene.yml index 08c750ef..2d68ed11 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -41,6 +41,10 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + + admin_users_host: - equinox @@ -74,9 +78,7 @@ blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes - -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 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 0c4e13fb..b38b3929 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -25,6 +25,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -46,7 +48,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml index 87d04db2..4288bc15 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -20,10 +20,13 @@ kubelet_storage: fs: ext4 +spreadspace_apt_repo_components: + - container + acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" -kubernetes_version: 1.21.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index c36d7eba..c2c6d305 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -20,6 +20,9 @@ kubelet_storage: fs: ext4 +spreadspace_apt_repo_components: + - container + ssh_users_root: - equinox - datacop @@ -27,7 +30,7 @@ ssh_users_root: acmetool_directory_server: "{{ acmetool_directory_server_le_live_v2 }}" -kubernetes_version: 1.21.2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index 115b2bd8..4db87e7c 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -43,6 +43,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -53,6 +56,7 @@ lvm_groups: blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes + docker_pkg_provider: docker-com docker_storage: @@ -69,8 +73,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.3 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 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 2bdbd354..42a9d7d8 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -41,6 +41,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container zfs_arc_size: min: 1GB @@ -71,7 +73,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 9cff4891..108ecca7 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -13,7 +13,11 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 + +spreadspace_apt_repo_components: + - container + +kubernetes_version: 1.22.5 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-dione.yml b/inventory/host_vars/glt-dione.yml index fab997bc..c55b81b5 100644 --- a/inventory/host_vars/glt-dione.yml +++ b/inventory/host_vars/glt-dione.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -61,7 +64,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 f3bc6263..1f9eead6 100644 --- a/inventory/host_vars/glt-helene.yml +++ b/inventory/host_vars/glt-helene.yml @@ -41,6 +41,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 blackmagic_desktopvideo_include_gui: yes @@ -61,7 +64,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 966f3a74..c9ead024 100644 --- a/inventory/host_vars/glt-jitsi.yml +++ b/inventory/host_vars/glt-jitsi.yml @@ -13,7 +13,12 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 + +spreadspace_apt_repo_components: + - container + + +kubernetes_version: 1.22.5 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 b97b1a83..7b979511 100644 --- a/inventory/host_vars/glt-telesto.yml +++ b/inventory/host_vars/glt-telesto.yml @@ -41,6 +41,8 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container zfs_arc_size: min: 1GB @@ -71,7 +73,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 c2c3878c..dbe2e76a 100644 --- a/inventory/host_vars/glt-thetys.yml +++ b/inventory/host_vars/glt-thetys.yml @@ -40,6 +40,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -66,7 +69,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index 2d40a418..ddbebc24 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -40,6 +40,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + lvm_groups: storage: @@ -66,7 +69,7 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 4dd48a27..a732782d 100644 --- a/inventory/host_vars/lw-thetys.yml +++ b/inventory/host_vars/lw-thetys.yml @@ -26,6 +26,10 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + + docker_pkg_provider: docker-com docker_storage: @@ -42,7 +46,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 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 e292d060..e827c5e7 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -28,6 +28,9 @@ apt_repo_components: - contrib - non-free ## for microcode updates +spreadspace_apt_repo_components: + - container + blackmagic_desktopvideo_version: 11.7a12 @@ -48,7 +51,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.21.1 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sgg-icecast.yml b/inventory/host_vars/sgg-icecast.yml index eec37447..07871fe0 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -32,6 +32,9 @@ network: external_ip: "{{ network.primary.overlay }}" +spreadspace_apt_repo_components: + - container + nginx_server_names_hash_bucket_size: 64 @@ -51,8 +54,7 @@ kubelet_storage: size: 2G fs: ext4 -kubernetes_version: 1.22.2 -kubernetes_cri_tools_pkg_version: 1.21.0~2 +kubernetes_version: 1.22.5 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml index d5eccc59..9e97a8fb 100644 --- a/roles/kubernetes/base/defaults/main.yml +++ b/roles/kubernetes/base/defaults/main.yml @@ -1,2 +1,2 @@ --- -kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0~1" +kubernetes_cri_tools_pkg_version: "{{ ([0, 1] | map('extract', kubernetes_version.split('.'))) | join('.') }}.0-1" diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml index b457dd68..4ff976a1 100644 --- a/roles/kubernetes/base/tasks/main.yml +++ b/roles/kubernetes/base/tasks/main.yml @@ -1,4 +1,11 @@ --- +- name: check if prometheus apt component of spreadspace repo is enabled + assert: + msg: "please enable the 'container' component of spreadspace repo using 'spreadspace_apt_repo_components'" + that: + - spreadspace_apt_repo_components is defined + - "'container' in spreadspace_apt_repo_components" + - name: install container runtime include_tasks: "cri_{{ kubernetes_container_runtime }}.yml" @@ -13,10 +20,6 @@ include_role: name: apt-repo/kubernetes -- name: add apt repository for cri-tools - include_role: - name: apt-repo/kubic-project - - name: generate apt pin files for kubelet and cri-tools loop: - name: kubelet -- cgit v1.2.3