From caea61f4fb8b66aa2a0dc7aa2d2b8a06477d9706 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Tue, 17 Mar 2020 15:07:43 +0100
Subject: kubernetes role, cleanup and harmonization

---
 roles/kubernetes/kubeadm/base/tasks/main.yml | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

(limited to 'roles/kubernetes/kubeadm/base/tasks')

diff --git a/roles/kubernetes/kubeadm/base/tasks/main.yml b/roles/kubernetes/kubeadm/base/tasks/main.yml
index 8e913560..2d2bd324 100644
--- a/roles/kubernetes/kubeadm/base/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/base/tasks/main.yml
@@ -1,18 +1,18 @@
 ---
-- name: install kubeadm and kubectl
+- name: install kubeadm packages
   apt:
     name:
-    - haproxy
-    - hatop
-    - "kubeadm{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
-    - "kubectl{% if kubernetes.pkg_version is defined %}={{ kubernetes.pkg_version }}{% endif %}"
+      - haproxy
+      - hatop
+      - "kubeadm={{ kubernetes_version }}-00"
+      - "kubectl={{ kubernetes_version }}-00"
     state: present
+    force: yes
 
-- name: disable automatic upgrades for kubeadm and kubectl
-  when: kubernetes.pkg_version is defined
+- name: disable automatic upgrades for kubeadm/kubectl
   loop:
-  - kubeadm
-  - kubectl
+    - kubeadm
+    - kubectl
   dpkg_selections:
     name: "{{ item }}"
     selection: hold
@@ -25,7 +25,7 @@
     line: 'KUBELET_EXTRA_ARGS=--node-ip={{ kubernetes_overlay_node_ip }}'
     create: yes
 
-- name: add kubeadm completion for shells
+- name: add kubeadm config for shells
   loop:
     - zsh
     - bash
@@ -58,3 +58,6 @@
     marker: "### {mark} ANSIBLE MANAGED BLOCK for hatop ###"
     content: |
       alias hatop="hatop -s /var/run/haproxy/admin.sock"
+
+# - name: prepare network plugin
+#   include_tasks: "net_{{ kubernetes_network_plugin }}.yml"
-- 
cgit v1.2.3