From 6410c78efc00ae9912add317bb4827a52852a77e Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Sun, 3 May 2020 04:31:11 +0200
Subject: move apt-repo/kubernetes out of kubernetes base role

---
 chaos-at-home/ch-equinox-ws.yml             |   1 +
 inventory/host_vars/ch-equinox-ws.yml       |   3 ++-
 roles/apt-repo/kubernetes/files/repo.gpg    | Bin 0 -> 659 bytes
 roles/apt-repo/kubernetes/handlers/main.yml |   4 ++++
 roles/apt-repo/kubernetes/tasks/main.yml    |  21 +++++++++++++++++++++
 roles/kubernetes/base/files/apt-key.gpg     | Bin 659 -> 0 bytes
 roles/kubernetes/base/handlers/main.yml     |   4 ----
 roles/kubernetes/base/tasks/main.yml        |  23 +++--------------------
 8 files changed, 31 insertions(+), 25 deletions(-)
 create mode 100644 roles/apt-repo/kubernetes/files/repo.gpg
 create mode 100644 roles/apt-repo/kubernetes/handlers/main.yml
 create mode 100644 roles/apt-repo/kubernetes/tasks/main.yml
 delete mode 100644 roles/kubernetes/base/files/apt-key.gpg
 delete mode 100644 roles/kubernetes/base/handlers/main.yml

diff --git a/chaos-at-home/ch-equinox-ws.yml b/chaos-at-home/ch-equinox-ws.yml
index d4701577..b4a812e0 100644
--- a/chaos-at-home/ch-equinox-ws.yml
+++ b/chaos-at-home/ch-equinox-ws.yml
@@ -8,4 +8,5 @@
   - role: admin-user
   - role: apt-repo/spreadspace
   - role: apt-repo/tor-project
+  - role: apt-repo/kubernetes
   - role: ubuntu-ws
diff --git a/inventory/host_vars/ch-equinox-ws.yml b/inventory/host_vars/ch-equinox-ws.yml
index cbf73c28..d3307c2e 100644
--- a/inventory/host_vars/ch-equinox-ws.yml
+++ b/inventory/host_vars/ch-equinox-ws.yml
@@ -155,13 +155,14 @@ ubuntu_ws_extra_packages:
   # needs apt-rep/tor-project
   - tor
   - tor-geoipdb
+  # needs apt-rep/kubernetes
+  - kubectl
 
 ## needs PPA or other external repo ??
   # - ansible
   # - bazel
   # - deadbeef
   # - google-chrome-stable
-  # - kubectl
   # - opera-stable
   # - studio-link-standalone
   # - virtualbox
diff --git a/roles/apt-repo/kubernetes/files/repo.gpg b/roles/apt-repo/kubernetes/files/repo.gpg
new file mode 100644
index 00000000..4333672c
Binary files /dev/null and b/roles/apt-repo/kubernetes/files/repo.gpg differ
diff --git a/roles/apt-repo/kubernetes/handlers/main.yml b/roles/apt-repo/kubernetes/handlers/main.yml
new file mode 100644
index 00000000..03ed878a
--- /dev/null
+++ b/roles/apt-repo/kubernetes/handlers/main.yml
@@ -0,0 +1,4 @@
+---
+- name: update apt cache
+  apt:
+    update_cache: yes
diff --git a/roles/apt-repo/kubernetes/tasks/main.yml b/roles/apt-repo/kubernetes/tasks/main.yml
new file mode 100644
index 00000000..f2bdc0fb
--- /dev/null
+++ b/roles/apt-repo/kubernetes/tasks/main.yml
@@ -0,0 +1,21 @@
+---
+- name: install apt https transport
+  apt:
+    name: apt-transport-https
+    state: present
+
+- name: add repository key
+  copy:
+    src: repo.gpg
+    dest: /etc/apt/trusted.gpg.d/kubernetes.gpg
+  notify: update apt cache
+
+- name: add repository entry
+  copy:
+    content: |
+      deb https://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
diff --git a/roles/kubernetes/base/files/apt-key.gpg b/roles/kubernetes/base/files/apt-key.gpg
deleted file mode 100644
index 4333672c..00000000
Binary files a/roles/kubernetes/base/files/apt-key.gpg and /dev/null differ
diff --git a/roles/kubernetes/base/handlers/main.yml b/roles/kubernetes/base/handlers/main.yml
deleted file mode 100644
index 03ed878a..00000000
--- a/roles/kubernetes/base/handlers/main.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- 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 28d6a62e..721bc730 100644
--- a/roles/kubernetes/base/tasks/main.yml
+++ b/roles/kubernetes/base/tasks/main.yml
@@ -10,26 +10,9 @@
   when: kubelet_zfs is defined
   import_tasks: zfs.yml
 
-- name: install apt https transport
-  apt:
-    name: apt-transport-https
-    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 repository entry
-  copy:
-    content: |
-      deb https://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: add debian repository
+  include_role:
+    name: apt-repo/kubernetes
 
 - name: install kubelet and common packages
   apt:
-- 
cgit v1.2.3