From 6410c78efc00ae9912add317bb4827a52852a77e Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Sun, 3 May 2020 04:31:11 +0200 Subject: move apt-repo/kubernetes out of kubernetes base role --- 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 +++-------------------- 3 files changed, 3 insertions(+), 24 deletions(-) delete mode 100644 roles/kubernetes/base/files/apt-key.gpg delete mode 100644 roles/kubernetes/base/handlers/main.yml (limited to 'roles/kubernetes/base') 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