From 8da0a5913723f4ec8fbea96aca0cac91f5f4cdbb Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 2 Feb 2023 22:51:37 +0100
Subject: ele-media: upgrade nextcloud and kubelet

---
 inventory/host_vars/ele-media.yml                                     | 4 ++--
 roles/docker/engine/tasks/main.yml                                    | 3 +--
 roles/elevate/media/templates/dstat.sh.j2                             | 2 +-
 roles/kubernetes/base/defaults/main.yml                               | 2 +-
 .../kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2 | 1 +
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/inventory/host_vars/ele-media.yml b/inventory/host_vars/ele-media.yml
index c11b9c42..e58dcbeb 100644
--- a/inventory/host_vars/ele-media.yml
+++ b/inventory/host_vars/ele-media.yml
@@ -46,7 +46,7 @@ kubelet_storage:
   size: 5G
   fs: ext4
 
-kubernetes_version: 1.23.3
+kubernetes_version: 1.26.1
 kubernetes_container_runtime: docker
 kubernetes_standalone_cni_variant: with-portmap
 
@@ -106,7 +106,7 @@ elevate_media_nextcloud_storage:
 
 elevate_media_nextcloud_instance_name: media.elevate.at
 elevate_media_nextcloud_instance:
-  version: 24.0.2
+  version: 25.0.3
   port: 8100
   hostnames:
   - media.elevate.at
diff --git a/roles/docker/engine/tasks/main.yml b/roles/docker/engine/tasks/main.yml
index a4f58768..b93d4174 100644
--- a/roles/docker/engine/tasks/main.yml
+++ b/roles/docker/engine/tasks/main.yml
@@ -49,10 +49,9 @@
     state: present
     allow_downgrade: yes
 
-  ## TODO: for now this is only needed on Debian Bullseye when using the docker.io package from the official repository
+  ## TODO: for now this is only needed on Debian Bullseye
 - name: install apparmor
   when:
-  - docker_pkg_provider == 'distro'
   - ansible_distribution == 'Debian' and (ansible_distribution_major_version | int) == 11
   apt:
     name: apparmor
diff --git a/roles/elevate/media/templates/dstat.sh.j2 b/roles/elevate/media/templates/dstat.sh.j2
index 2ff572fb..236c9888 100644
--- a/roles/elevate/media/templates/dstat.sh.j2
+++ b/roles/elevate/media/templates/dstat.sh.j2
@@ -11,4 +11,4 @@ if [ -n "$1" ]; then
   DISKS="$DISKS,$1"
 fi
 
-exec dstat -cymnd -D "$DISKS" --top-io --top-bio
+exec dstat -cymnd -D "$DISKS" --disk-util
diff --git a/roles/kubernetes/base/defaults/main.yml b/roles/kubernetes/base/defaults/main.yml
index 9e97a8fb..af48181c 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-00"
diff --git a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2 b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
index 13911b31..390c1b15 100644
--- a/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
+++ b/roles/kubernetes/kubeadm/control-plane/templates/kubeadm-init.config.j2
@@ -14,6 +14,7 @@ localAPIEndpoint:
 {% if kubernetes_network_plugin_replaces_kube_proxy %}
 skipPhases:
 - addon/kube-proxy
+{#- show-join-command  can be enable for 1.26+  #}
 {% endif %}
 nodeRegistration:
   name: "{{ kubernetes_node_name }}"
-- 
cgit v1.2.3