From c744bb30fe4a0324e9a222a667f0e432795c544f Mon Sep 17 00:00:00 2001 From: Salt Date: Mon, 1 Mar 2021 03:36:23 -0600 Subject: [PATCH] Minor fixes alla round --- k8s.sh | 1 + playbooks/pik8s.yml | 7 ++++++- playbooks/pimp.yml | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/k8s.sh b/k8s.sh index 30d2386..ecf9f37 100755 --- a/k8s.sh +++ b/k8s.sh @@ -1,5 +1,6 @@ #! /bin/sh +unset KUBECONFIG K8S_AUTH_KUBECONFIG ansible-playbook playbooks/pik8s.yml "$@" \ -i inventory-localhost \ -l localhost \ diff --git a/playbooks/pik8s.yml b/playbooks/pik8s.yml index 002f2b6..80d2c50 100755 --- a/playbooks/pik8s.yml +++ b/playbooks/pik8s.yml @@ -4,6 +4,10 @@ # k8s - hosts: pik8s gather_facts: no + tasks: + - name: install nfs-common + apt: name=nfs-common + tags: [ k8s, packages, apt ] roles: - role: k8s tags: [ k8s, skip-pull ] @@ -27,10 +31,11 @@ group/k8s: api_version: v1 host: "https://192.168.102.1:6443" - ca_cert: "{{ k8s_path }}/ca.crt" kubeconfig: "{{ k8s_path }}/kubeconfig" client_cert: "{{ k8s_path }}/client.crt" client_key: "{{ k8s_path }}/client.key" + context: kubernetes-admin@kubernetes + validate_certs: no tasks: - name: assure nfs pv k8s: diff --git a/playbooks/pimp.yml b/playbooks/pimp.yml index 82f19ec..4d8d9a2 100755 --- a/playbooks/pimp.yml +++ b/playbooks/pimp.yml @@ -43,7 +43,7 @@ vars: nfs_exports: - "/srv/nfs/bulk 192.168.0.0/16(rw,no_root_squash,sync) 172.23.0.0/16(rw,no_root_squash,sync)" - - "/srv/nfs/k8s 192.168.103.0/24(rw,no_root_squash,sync)" + - "/srv/nfs/k8s 192.168.102.0/24(rw,no_root_squash,sync)" tags: [ pis, storage, nfs ] # Multipurpose Pis running unbound - hosts: pi-mp-1.desu.ltd,pi-mp-2.desu.ltd