From 4e4919c99d20e4a188eb9816b16fabf93ca1bd5e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 17 Jul 2024 22:51:33 +0200 Subject: upgrade kubernetes_version for some hosts --- inventory/host_vars/ch-apps/vars.yml | 2 +- inventory/host_vars/ch-companion-raspi.yml | 3 +-- inventory/host_vars/ch-dione.yml | 2 +- inventory/host_vars/ch-helene.yml | 2 +- inventory/host_vars/ele-calypso.yml | 2 +- inventory/host_vars/ele-companion-raspi.yml | 3 +-- inventory/host_vars/ele-coturn.yml | 2 +- inventory/host_vars/ele-helene.yml | 2 +- inventory/host_vars/ele-jitsi.yml | 2 +- inventory/host_vars/ele-thetys.yml | 2 +- inventory/host_vars/glt-jitsi.yml | 2 +- inventory/host_vars/s2-thetys.yml | 2 +- inventory/host_vars/sk-testvm.yml | 2 +- roles/kubernetes/standalone/base/defaults/main.yml | 2 -- roles/kubernetes/standalone/base/tasks/main.yml | 29 ++++++++++------------ 15 files changed, 26 insertions(+), 33 deletions(-) diff --git a/inventory/host_vars/ch-apps/vars.yml b/inventory/host_vars/ch-apps/vars.yml index f39d57f1..a3f34992 100644 --- a/inventory/host_vars/ch-apps/vars.yml +++ b/inventory/host_vars/ch-apps/vars.yml @@ -141,7 +141,7 @@ kubelet_storage: quota: 10G 'syncoid:sync': 'false' -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ch-companion-raspi.yml b/inventory/host_vars/ch-companion-raspi.yml index 54051960..d8134f27 100644 --- a/inventory/host_vars/ch-companion-raspi.yml +++ b/inventory/host_vars/ch-companion-raspi.yml @@ -29,11 +29,10 @@ docker_pkg_provider: docker-com docker_plugins: - buildx -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap -kubernetes_standalone_install_kubeletctl: no companion_storage: diff --git a/inventory/host_vars/ch-dione.yml b/inventory/host_vars/ch-dione.yml index 0357d012..8534d2fb 100644 --- a/inventory/host_vars/ch-dione.yml +++ b/inventory/host_vars/ch-dione.yml @@ -49,7 +49,7 @@ kubelet_storage: size: 5G fs: ext4 -# kubernetes_version: 1.30.2 +# kubernetes_version: 1.30.3 # 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 b9b7c638..61d4f7ef 100644 --- a/inventory/host_vars/ch-helene.yml +++ b/inventory/host_vars/ch-helene.yml @@ -49,7 +49,7 @@ kubelet_storage: size: 5G fs: ext4 -# kubernetes_version: 1.30.2 +# kubernetes_version: 1.30.3 # 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 75054533..a2607fc6 100644 --- a/inventory/host_vars/ele-calypso.yml +++ b/inventory/host_vars/ele-calypso.yml @@ -74,7 +74,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-companion-raspi.yml b/inventory/host_vars/ele-companion-raspi.yml index 3f2a6c69..7d130639 100644 --- a/inventory/host_vars/ele-companion-raspi.yml +++ b/inventory/host_vars/ele-companion-raspi.yml @@ -29,11 +29,10 @@ docker_pkg_provider: docker-com docker_plugins: - buildx -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap -kubernetes_standalone_install_kubeletctl: no companion_storage: diff --git a/inventory/host_vars/ele-coturn.yml b/inventory/host_vars/ele-coturn.yml index 2186b775..f966ac9e 100644 --- a/inventory/host_vars/ele-coturn.yml +++ b/inventory/host_vars/ele-coturn.yml @@ -27,7 +27,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" acme_client: acmetool -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 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-helene.yml b/inventory/host_vars/ele-helene.yml index 48efb84b..6eef576d 100644 --- a/inventory/host_vars/ele-helene.yml +++ b/inventory/host_vars/ele-helene.yml @@ -92,7 +92,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 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 b242e0bc..ea446019 100644 --- a/inventory/host_vars/ele-jitsi.yml +++ b/inventory/host_vars/ele-jitsi.yml @@ -32,7 +32,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" acme_client: acmetool -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/ele-thetys.yml b/inventory/host_vars/ele-thetys.yml index bd72f98a..2911be57 100644 --- a/inventory/host_vars/ele-thetys.yml +++ b/inventory/host_vars/ele-thetys.yml @@ -77,7 +77,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 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 f54997e4..2e36c347 100644 --- a/inventory/host_vars/glt-jitsi.yml +++ b/inventory/host_vars/glt-jitsi.yml @@ -27,7 +27,7 @@ acme_directory_server: "{{ acme_directory_server_le_live_v2 }}" acme_client: acmetool -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/s2-thetys.yml b/inventory/host_vars/s2-thetys.yml index 337b0f5d..5f2897c9 100644 --- a/inventory/host_vars/s2-thetys.yml +++ b/inventory/host_vars/s2-thetys.yml @@ -53,7 +53,7 @@ kubelet_storage: size: 5G fs: ext4 -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 42 kubernetes_standalone_cni_variant: with-portmap diff --git a/inventory/host_vars/sk-testvm.yml b/inventory/host_vars/sk-testvm.yml index 860be21d..0c45dfcb 100644 --- a/inventory/host_vars/sk-testvm.yml +++ b/inventory/host_vars/sk-testvm.yml @@ -56,7 +56,7 @@ kubelet_storage: size: 1G fs: ext4 -kubernetes_version: 1.30.2 +kubernetes_version: 1.30.3 kubernetes_container_runtime: docker kubernetes_standalone_max_pods: 100 kubernetes_standalone_pod_cidr: 192.168.255.0/24 diff --git a/roles/kubernetes/standalone/base/defaults/main.yml b/roles/kubernetes/standalone/base/defaults/main.yml index 396f7c68..3f6b52bb 100644 --- a/roles/kubernetes/standalone/base/defaults/main.yml +++ b/roles/kubernetes/standalone/base/defaults/main.yml @@ -15,5 +15,3 @@ kubernetes_standalone_cni_variant: with-portmap kubernetes_standalone_local_services_tcp: [] kubernetes_standalone_local_services_udp: [] - -kubernetes_standalone_install_kubeletctl: yes diff --git a/roles/kubernetes/standalone/base/tasks/main.yml b/roles/kubernetes/standalone/base/tasks/main.yml index d95f9a20..549fe216 100644 --- a/roles/kubernetes/standalone/base/tasks/main.yml +++ b/roles/kubernetes/standalone/base/tasks/main.yml @@ -57,20 +57,17 @@ enabled: yes - name: install kubeletctl - when: kubernetes_standalone_install_kubeletctl - block: - - name: install kubeletctl package - apt: - name: kubeletctl - state: present + apt: + name: kubeletctl + state: present - - name: add kubeletctl config for shells - loop: - - zsh - - bash - blockinfile: - path: "/root/.{{ item }}rc" - create: yes - marker: "### {mark} ANSIBLE MANAGED BLOCK for kubeletctl ###" - content: | - alias kubeletctl="kubeletctl --server 127.0.0.1 --cacert /etc/ssl/standalone-kubelet/ca-crt.pem --cert /etc/ssl/standalone-kubelet/client/crt.pem --key /etc/ssl/standalone-kubelet/client/key.pem --ignoreconfig" +- name: add kubeletctl config for shells + loop: + - zsh + - bash + blockinfile: + path: "/root/.{{ item }}rc" + create: yes + marker: "### {mark} ANSIBLE MANAGED BLOCK for kubeletctl ###" + content: | + alias kubeletctl="kubeletctl --server 127.0.0.1 --cacert /etc/ssl/standalone-kubelet/ca-crt.pem --cert /etc/ssl/standalone-kubelet/client/crt.pem --key /etc/ssl/standalone-kubelet/client/key.pem --ignoreconfig" -- cgit v1.2.3