summaryrefslogtreecommitdiff
path: root/roles
diff options
context:
space:
mode:
Diffstat (limited to 'roles')
-rw-r--r--roles/apt-repo/kubernetes/files/repo.gpg (renamed from roles/kubernetes/base/files/apt-key.gpg)bin659 -> 659 bytes
-rw-r--r--roles/apt-repo/kubernetes/handlers/main.yml (renamed from roles/kubernetes/base/handlers/main.yml)0
-rw-r--r--roles/apt-repo/kubernetes/tasks/main.yml21
-rw-r--r--roles/kubernetes/base/tasks/main.yml23
4 files changed, 24 insertions, 20 deletions
diff --git a/roles/kubernetes/base/files/apt-key.gpg b/roles/apt-repo/kubernetes/files/repo.gpg
index 4333672c..4333672c 100644
--- a/roles/kubernetes/base/files/apt-key.gpg
+++ b/roles/apt-repo/kubernetes/files/repo.gpg
Binary files differ
diff --git a/roles/kubernetes/base/handlers/main.yml b/roles/apt-repo/kubernetes/handlers/main.yml
index 03ed878a..03ed878a 100644
--- a/roles/kubernetes/base/handlers/main.yml
+++ b/roles/apt-repo/kubernetes/handlers/main.yml
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/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: