From 28b5ce50719d0775ddaaee905d78fef6dbbf7d3f Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sat, 28 Sep 2019 02:12:51 +0200
Subject: no more apt_key and apt_repository module

---
 roles/kubernetes/base/files/apt-key.gpg            | Bin 0 -> 659 bytes
 roles/kubernetes/base/files/kubernetes-apt-key.asc |  18 ----------------
 roles/kubernetes/base/handlers/main.yml            |   4 ++++
 roles/kubernetes/base/tasks/main.yml               |  24 ++++++++++++---------
 4 files changed, 18 insertions(+), 28 deletions(-)
 create mode 100644 roles/kubernetes/base/files/apt-key.gpg
 delete mode 100644 roles/kubernetes/base/files/kubernetes-apt-key.asc
 create mode 100644 roles/kubernetes/base/handlers/main.yml

(limited to 'roles/kubernetes')

diff --git a/roles/kubernetes/base/files/apt-key.gpg b/roles/kubernetes/base/files/apt-key.gpg
new file mode 100644
index 00000000..4333672c
Binary files /dev/null and b/roles/kubernetes/base/files/apt-key.gpg differ
diff --git a/roles/kubernetes/base/files/kubernetes-apt-key.asc b/roles/kubernetes/base/files/kubernetes-apt-key.asc
deleted file mode 100644
index 10af13ea..00000000
--- a/roles/kubernetes/base/files/kubernetes-apt-key.asc
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFrBaNsBCADrF18KCbsZlo4NjAvVecTBCnp6WcBQJ5oSh7+E98jX9YznUCrN
-rgmeCcCMUvTDRDxfTaDJybaHugfba43nqhkbNpJ47YXsIa+YL6eEE9emSmQtjrSW
-IiY+2YJYwsDgsgckF3duqkb02OdBQlh6IbHPoXB6H//b1PgZYsomB+841XW1LSJP
-YlYbIrWfwDfQvtkFQI90r6NknVTQlpqQh5GLNWNYqRNrGQPmsB+NrUYrkl1nUt1L
-RGu+rCe4bSaSmNbwKMQKkROE4kTiB72DPk7zH4Lm0uo0YFFWG4qsMIuqEihJ/9KN
-X8GYBr+tWgyLooLlsdK3l+4dVqd8cjkJM1ExABEBAAG0QEdvb2dsZSBDbG91ZCBQ
-YWNrYWdlcyBBdXRvbWF0aWMgU2lnbmluZyBLZXkgPGdjLXRlYW1AZ29vZ2xlLmNv
-bT6JAT4EEwECACgFAlrBaNsCGy8FCQWjmoAGCwkIBwMCBhUIAgkKCwQWAgMBAh4B
-AheAAAoJEGoDCyG6B/T78e8H/1WH2LN/nVNhm5TS1VYJG8B+IW8zS4BqyozxC9iJ
-AJqZIVHXl8g8a/Hus8RfXR7cnYHcg8sjSaJfQhqO9RbKnffiuQgGrqwQxuC2jBa6
-M/QKzejTeP0Mgi67pyrLJNWrFI71RhritQZmzTZ2PoWxfv6b+Tv5v0rPaG+ut1J4
-7pn+kYgtUaKdsJz1umi6HzK6AacDf0C0CksJdKG7MOWsZcB4xeOxJYuy6NuO6Kcd
-Ez8/XyEUjIuIOlhYTd0hH8E/SEBbXXft7/VBQC5wNq40izPi+6WFK/e1O42DIpzQ
-749ogYQ1eodexPNhLzekKR3XhGrNXJ95r5KO10VrsLFNd8I=
-=TKuP
------END PGP PUBLIC KEY BLOCK-----
diff --git a/roles/kubernetes/base/handlers/main.yml b/roles/kubernetes/base/handlers/main.yml
new file mode 100644
index 00000000..03ed878a
--- /dev/null
+++ b/roles/kubernetes/base/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: update apt cache
+  apt:
+    update_cache: yes
diff --git a/roles/kubernetes/base/tasks/main.yml b/roles/kubernetes/base/tasks/main.yml
index c873fc52..bf62f7d2 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -25,18 +25,22 @@
   apt:
     name: apt-transport-https
     state: present
-    force: yes
 
-- name: add kubernetes apt key
-  apt_key:
-    data: "{{ lookup('file', 'kubernetes-apt-key.asc') }}"
-    state: present
+- name: add repository key
+  copy:
+    src: apt-key.gpg
+    dest: /etc/apt/trusted.gpg.d/kubernetes.gpg
+  notify: update apt cache
 
-- name: add kubernetes apt repo
-  apt_repository:
-    repo: deb http://apt.kubernetes.io/ kubernetes-xenial main
-    state: present
-    filename: kubernetes
+- name: add repository entry
+  copy:
+    content: |
+      deb http://apt.kubernetes.io/ kubernetes-xenial main
+    dest: /etc/apt/sources.list.d/kubernetes.list
+  notify: update apt cache
+
+- name: update apt cache
+  meta: flush_handlers
 
 - name: install basic kubernetes components
   apt:
-- 
cgit v1.2.3