summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-06-17 00:13:46 +0200
committerChristian Pointner <equinox@spreadspace.org>2020-06-17 00:13:46 +0200
commit9fdd190e0ac9ac5b82c40c2f90aa25a3c0c0b0ae (patch)
tree029e519c6901a19f4582952d4f681275031322f5
parentfinalize handling of network plugins. (needs testing) (diff)
kubernetes: install addon configs into common sub-dir
-rw-r--r--roles/kubernetes/addons/metrics-server/tasks/main.yml9
-rw-r--r--roles/kubernetes/kubeadm/reset/tasks/main.yml1
2 files changed, 8 insertions, 2 deletions
diff --git a/roles/kubernetes/addons/metrics-server/tasks/main.yml b/roles/kubernetes/addons/metrics-server/tasks/main.yml
index e09106c1..fb725a87 100644
--- a/roles/kubernetes/addons/metrics-server/tasks/main.yml
+++ b/roles/kubernetes/addons/metrics-server/tasks/main.yml
@@ -1,10 +1,15 @@
---
+- name: create base directory for metrics-server addon
+ file:
+ path: /etc/kubernetes/addons/metrics-server
+ state: directory
+
- name: copy config for metrics-server
template:
src: "components.{{ kubernetes_metrics_server_version }}.yml.j2"
- dest: /etc/kubernetes/metrics-server.yml
+ dest: /etc/kubernetes/addons/metrics-server/config.yml
- name: install metrics-server onto the cluster
- command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/metrics-server.yml
+ command: kubectl --kubeconfig /etc/kubernetes/admin.conf apply -f /etc/kubernetes/addons/metrics-server/config.yml
register: kube_metrics_server_apply_result
changed_when: (kube_metrics_server_apply_result.stdout_lines | reject("regex", " unchanged$") | list | length) > 0
diff --git a/roles/kubernetes/kubeadm/reset/tasks/main.yml b/roles/kubernetes/kubeadm/reset/tasks/main.yml
index 1ecf1c1e..57a3faf4 100644
--- a/roles/kubernetes/kubeadm/reset/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/reset/tasks/main.yml
@@ -13,6 +13,7 @@
- /etc/kubernetes/encryption
- /etc/kubernetes/network-plugin.yml
- /etc/kubernetes/node-local-dns.yml
+ - /etc/kubernetes/addons
file:
path: "{{ item }}"
state: absent