From 907572942f57d3be60cd1fe52763ec0be89e5831 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 23 Apr 2023 04:07:25 +0200 Subject: kubernetes/standalone: upgrade to 1.27+ --- inventory/host_vars/ch-apps.yml | 4 ++-- inventory/host_vars/ch-dione.yml | 3 ++- inventory/host_vars/ch-helene.yml | 3 ++- inventory/host_vars/ch-thetys.yml | 3 ++- inventory/host_vars/ele-calypso.yml | 4 ++-- inventory/host_vars/ele-coturn.yml | 4 ++-- inventory/host_vars/ele-helene.yml | 3 ++- inventory/host_vars/ele-jitsi.yml | 3 ++- inventory/host_vars/ele-media.yml | 5 +++-- inventory/host_vars/ele-thetys.yml | 3 ++- inventory/host_vars/glt-calypso.yml | 3 ++- inventory/host_vars/glt-coturn.yml | 4 ++-- inventory/host_vars/glt-meet1.yml | 3 ++- inventory/host_vars/glt-meet2.yml | 3 ++- inventory/host_vars/glt-tsdatacop.yml | 3 ++- inventory/host_vars/s2-thetys.yml | 3 ++- inventory/host_vars/sgg-icecast.yml | 3 ++- inventory/host_vars/sk-cloudio/nextcloud.yml | 8 ++++---- inventory/host_vars/sk-cloudio/vars.yml | 6 ++++-- inventory/host_vars/sk-tomnext-nc.yml | 8 +++++--- roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 | 1 + .../standalone/base/templates/kubelet.service.override.j2 | 2 -- 22 files changed, 49 insertions(+), 33 deletions(-) diff --git a/inventory/host_vars/ch-apps.yml b/inventory/host_vars/ch-apps.yml index 9c263712..f83f30c0 100644 --- a/inventory/host_vars/ch-apps.yml +++ b/inventory/host_vars/ch-apps.yml @@ -108,8 +108,8 @@ kubelet_storage: quota: 10G 'syncoid:sync': 'false' -kubernetes_version: 1.25.0 -kubernetes_cri_tools_pkg_version: 1.24.2-00 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 2430e525..68af4df5 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -54,7 +54,8 @@ kubelet_storage: size: 5G fs: ext4 -# kubernetes_version: 1.24.0 +# kubernetes_version: 1.27.1 +# kubernetes_cri_tools_pkg_version: 1.26.0-00 # kubernetes_container_runtime: docker # 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 a8a1c63f..3baeca7c 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -54,7 +54,8 @@ kubelet_storage: size: 5G fs: ext4 -# kubernetes_version: 1.24.0 +# kubernetes_version: 1.27.1 +# kubernetes_cri_tools_pkg_version: 1.26.0-00 # kubernetes_container_runtime: docker # 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 bfe9cedc..d34bcdd6 100644 --- a/inventory/host_vars/ch-thetys.yml +++ b/inventory/host_vars/ch-thetys.yml @@ -47,7 +47,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-calypso.yml b/inventory/host_vars/ele-calypso.yml index 46ccb354..33b2e655 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -70,8 +70,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.25.0 -kubernetes_cri_tools_pkg_version: 1.24.2-00 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 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 0c91ad49..e89332be 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -26,10 +26,10 @@ spreadspace_apt_repo_components: acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml index 29b34aa6..5b4a0bf8 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -89,7 +89,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-jitsi.yml b/inventory/host_vars/ele-jitsi.yml index c48cfddb..428da2a4 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -31,7 +31,8 @@ ssh_users_root: acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml index f12d6a4f..970eb283 100644 --- a/inventory/host_vars/ele-media.yml +++ b/inventory/host_vars/ele-media.yml @@ -69,7 +69,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_cni_variant: with-portmap @@ -129,7 +130,7 @@ elevate_media_nextcloud_storage: elevate_media_nextcloud_instance_name: media.elevate.at elevate_media_nextcloud_instance: - version: 25.0.4 + version: 26.0.1 port: 8100 hostnames: - media.elevate.at diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index a4738859..ea97dc17 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -78,7 +78,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 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 a13611d6..35e1ef7d 100644 --- a/inventory/host_vars/glt-calypso.yml +++ b/inventory/host_vars/glt-calypso.yml @@ -57,7 +57,8 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 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 898f36ff..df6e1215 100644 --- a/inventory/host_vars/glt-coturn.yml +++ b/inventory/host_vars/glt-coturn.yml @@ -17,10 +17,10 @@ kubelet_storage: spreadspace_apt_repo_components: - container -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-meet1.yml b/inventory/host_vars/glt-meet1.yml index ea860b04..592a096d 100644 --- a/inventory/host_vars/glt-meet1.yml +++ b/inventory/host_vars/glt-meet1.yml @@ -18,7 +18,8 @@ spreadspace_apt_repo_components: - container -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-meet2.yml b/inventory/host_vars/glt-meet2.yml index b86d0103..1224aab2 100644 --- a/inventory/host_vars/glt-meet2.yml +++ b/inventory/host_vars/glt-meet2.yml @@ -18,7 +18,8 @@ spreadspace_apt_repo_components: - container -kubernetes_version: 1.26.1 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/glt-tsdatacop.yml b/inventory/host_vars/glt-tsdatacop.yml index 2e53a878..1ddbe429 100644 --- a/inventory/host_vars/glt-tsdatacop.yml +++ b/inventory/host_vars/glt-tsdatacop.yml @@ -53,7 +53,8 @@ kubelet_storage: size: 10G fs: ext4 -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 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 d373ff63..bf413157 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -53,7 +53,8 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 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 5d70cb2b..6142242d 100644 --- a/inventory/host_vars/sgg-icecast.yml +++ b/inventory/host_vars/sgg-icecast.yml @@ -55,7 +55,8 @@ kubelet_storage: size: 2G fs: ext4 -kubernetes_version: 1.22.5 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sk-cloudio/nextcloud.yml b/inventory/host_vars/sk-cloudio/nextcloud.yml index 0a884ac0..ff6d3794 100644 --- a/inventory/host_vars/sk-cloudio/nextcloud.yml +++ b/inventory/host_vars/sk-cloudio/nextcloud.yml @@ -8,7 +8,7 @@ nextcloud_zfs: nextcloud_instances: wolke.elevate.at: # new: true - version: 25.0.4 + version: 26.0.1 port: 8100 hostnames: - wolke.elevate.at @@ -28,7 +28,7 @@ nextcloud_instances: && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* insomnia.skillz.biz: # new: true - version: 25.0.4 + version: 26.0.1 port: 8101 hostnames: - insomnia.skillz.biz @@ -40,7 +40,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['insomnia.skillz.biz'] }}" nc.skillz.biz: # new: true - version: 25.0.4 + version: 26.0.1 port: 8102 hostnames: - nc.skillz.biz @@ -52,7 +52,7 @@ nextcloud_instances: password: "{{ vault_nextcloud_database_passwords['nc.skillz.biz'] }}" wae.elevate.at: # new: true - version: 25.0.4 + version: 26.0.1 port: 8104 hostnames: - wae.elevate.at diff --git a/inventory/host_vars/sk-cloudio/vars.yml b/inventory/host_vars/sk-cloudio/vars.yml index 99ae27db..7e7379c6 100644 --- a/inventory/host_vars/sk-cloudio/vars.yml +++ b/inventory/host_vars/sk-cloudio/vars.yml @@ -54,6 +54,8 @@ zfs_sanoid_modules: process_children_only: yes +docker_pkg_provider: docker-com + docker_storage: type: zfs pool: storage @@ -68,10 +70,10 @@ kubelet_storage: properties: quota: 20G -kubernetes_version: 1.23.2 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap kubernetes_standalone_local_services_tcp: diff --git a/inventory/host_vars/sk-tomnext-nc.yml b/inventory/host_vars/sk-tomnext-nc.yml index 09b93ad5..88f248f3 100644 --- a/inventory/host_vars/sk-tomnext-nc.yml +++ b/inventory/host_vars/sk-tomnext-nc.yml @@ -71,6 +71,8 @@ zfs_sanoid_modules: process_children_only: yes +docker_pkg_provider: docker-com + docker_storage: type: zfs pool: storage @@ -85,10 +87,10 @@ kubelet_storage: properties: quota: 15G -kubernetes_version: 1.26.3 +kubernetes_version: 1.27.1 +kubernetes_cri_tools_pkg_version: 1.26.0-00 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 15 -kubernetes_standalone_pod_cidr: 192.168.255.0/24 kubernetes_standalone_cni_variant: with-portmap kubernetes_standalone_local_services_tcp: @@ -114,7 +116,7 @@ nextcloud_zfs: nextcloud_instances: team.tomwaitz.eu: # new: true - version: 25.0.4 + version: 25.0.6 port: 8100 hostnames: - team.tomwaitz.eu diff --git a/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 b/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 index ae26d04d..c90efd9e 100644 --- a/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet-config.yml.j2 @@ -2,6 +2,7 @@ {# #} kind: KubeletConfiguration apiVersion: kubelet.config.k8s.io/v1beta1 +containerRuntimeEndpoint: {{ kubernetes_cri_socket }} staticPodPath: /etc/kubernetes/manifests address: {{ kubernetes_standalone_address }} port: {{ kubernetes_standalone_port }} diff --git a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 index d4637c72..33c2d4d0 100644 --- a/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 +++ b/roles/kubernetes/standalone/base/templates/kubelet.service.override.j2 @@ -1,6 +1,4 @@ [Service] ExecStart= ExecStart=/usr/bin/kubelet \ - --container-runtime=remote \ - --container-runtime-endpoint={{ kubernetes_cri_socket }} \ --config=/etc/kubernetes/kubelet.yml -- cgit v1.2.3