From e353d718bad284f6a73a64917380a2774b7f8d2e Mon Sep 17 00:00:00 2001
From: Sven Ketelsen <sven.ketelsen@netgo.de>
Date: Wed, 23 Feb 2022 12:32:26 +0100
Subject: [PATCH] bugfix: removed "ignore_errors: true" from patchday
 (kubernetes)

---
 group_vars/all/plain.yml       | 4 ++++
 group_vars/stage_dev/plain.yml | 5 +++++
 patchday.yml                   | 8 --------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/group_vars/all/plain.yml b/group_vars/all/plain.yml
index 6bd55db..35103fa 100644
--- a/group_vars/all/plain.yml
+++ b/group_vars/all/plain.yml
@@ -300,3 +300,7 @@ hcloud_firewall_objects:
 hetzner_authentication_ansible: "{{ hetzner_authentication_ansible_vault }}"
 hetzner_authentication_ccm: "{{ hetzner_authentication_ccm_vault }}"
 hetzner_authentication_csi: "{{ hetzner_authentication_csi_vault }}"
+
+k8s_basic_services:
+  - kubelet
+  - containerd
diff --git a/group_vars/stage_dev/plain.yml b/group_vars/stage_dev/plain.yml
index 44d7fe5..23c1483 100644
--- a/group_vars/stage_dev/plain.yml
+++ b/group_vars/stage_dev/plain.yml
@@ -343,3 +343,8 @@ management_oidc_client_secret: "{{ management_oidc_client_secret_vault }}"
 # smardigo automation DEV gpg key
 # pub part => https://dev-gitea-01.smardigo.digital/gitea-admin/communication-keys/
 gpg_key_smardigo_automation__private: '{{ gpg_key_smardigo_automation__private__vault }}'
+
+# TODO Upgrade dev state for containerd usage
+k8s_basic_services:
+  - kubelet
+  - docker
diff --git a/patchday.yml b/patchday.yml
index 84cd78d..d42ac26 100644
--- a/patchday.yml
+++ b/patchday.yml
@@ -143,12 +143,6 @@
 
 - hosts: k8s_cluster
   serial: 1
-  vars:
-    k8s_basic_services:
-      - kubelet
-# TODO check if docker or containerd is used
-      - docker
-      - containerd
 
   tasks:
       # draining the hard way
@@ -172,7 +166,6 @@
         name: '{{ item }}'
         state: stopped
       loop: '{{ k8s_basic_services }}'
-      ignore_errors: true
 
     - name: "Smardigo Patchday: update pkgs"
       ansible.builtin.apt:
@@ -200,7 +193,6 @@
         name: '{{ item }}'
         state: started
       loop: '{{ k8s_basic_services }}'
-      ignore_errors: true
 
     - name: "Smardigo Patchday: wait for node readiness"
       delegate_to: "{{ groups['kube_control_plane'][0] }}"