From 7c4e00e45eb6f7163599eb75c0556dcf9ce486f9 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Wed, 16 Jun 2021 15:47:45 +0200
Subject: add TODO and links to PRs fixing the force=yes workarounds of the apt
 module

---
 roles/kubernetes/base/tasks/main.yml         |  3 +++
 roles/kubernetes/kubeadm/base/tasks/main.yml | 19 +++++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'roles/kubernetes')

diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index e10e4a78..70be0d3a 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -25,6 +25,9 @@
     - "kubelet={{ kubernetes_version }}-00"
     state: present
     force: yes
+    ## TODO: remove force once the following changes are available
+    ##   https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562
+    ##   https://github.com/ansible/ansible/pull/74852
 
 - name: disable automatic upgrades for kubelet and cri-tools
   loop:
diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml
index 7d882f31..0fab7845 100644
--- a/roles/kubernetes/kubeadm/base/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/base/tasks/main.yml
@@ -2,17 +2,20 @@
 - name: install kubeadm packages
   apt:
     name:
-      - haproxy
-      - haproxyctl
-      - "kubeadm={{ kubernetes_version }}-00"
-      - "kubectl={{ kubernetes_version }}-00"
+    - haproxy
+    - haproxyctl
+    - "kubeadm={{ kubernetes_version }}-00"
+    - "kubectl={{ kubernetes_version }}-00"
     state: present
     force: yes
+    ## TODO: remove force once the following changes are available
+    ##   https://github.com/ansible/ansible/pull/73629 or https://github.com/ansible/ansible/pull/72562
+    ##   https://github.com/ansible/ansible/pull/74852
 
 - name: disable automatic upgrades for kubeadm/kubectl
   loop:
-    - kubeadm
-    - kubectl
+  - kubeadm
+  - kubectl
   dpkg_selections:
     name: "{{ item }}"
     selection: hold
@@ -27,8 +30,8 @@
 
 - name: add kubeadm config for shells
   loop:
-    - zsh
-    - bash
+  - zsh
+  - bash
   blockinfile:
     path: "/root/.{{ item }}rc"
     create: yes
-- 
cgit v1.2.3