From 7df05a755b54564686e68e44a6bb5c932e3d2ea1 Mon Sep 17 00:00:00 2001
From: Derek Nola <derek.nola@suse.com>
Date: Wed, 13 Dec 2023 12:59:04 -0800
Subject: [PATCH] Completely setup kubectl for ansible_user, with option to
 disable it (#278)

Signed-off-by: Derek Nola <derek.nola@suse.com>
---
 inventory-sample.yml               |  1 +
 roles/k3s_server/defaults/main.yml |  1 +
 roles/k3s_server/tasks/main.yml    | 63 ++++++++++++++++++------------
 3 files changed, 41 insertions(+), 24 deletions(-)

diff --git a/inventory-sample.yml b/inventory-sample.yml
index 8ec5e52..9e558ce 100644
--- a/inventory-sample.yml
+++ b/inventory-sample.yml
@@ -28,6 +28,7 @@ k3s_cluster:
     # List of locally available manifests to apply to the cluster, useful for PVCs or Traefik modifications.
     # extra_manifests: [ '/path/to/manifest1.yaml', '/path/to/manifest2.yaml' ]
     # airgap_dir: /tmp/k3s-airgap-images
+    # user_kubectl: true, by default kubectl is symlinked and configured for use by ansible_user. Set to false to only kubectl via root user.
     # server_config_yaml:  |
       # This is now an inner yaml file. Maintain the indentation.
       # YAML here will be placed as the content of /etc/rancher/k3s/config.yaml
diff --git a/roles/k3s_server/defaults/main.yml b/roles/k3s_server/defaults/main.yml
index 00d7ba4..c8ad4e0 100644
--- a/roles/k3s_server/defaults/main.yml
+++ b/roles/k3s_server/defaults/main.yml
@@ -3,3 +3,4 @@ k3s_server_location: "/var/lib/rancher/k3s"
 systemd_dir: "/etc/systemd/system"
 api_port: 6443
 kubeconfig: ~/.kube/config.new
+user_kubectl: true
diff --git a/roles/k3s_server/tasks/main.yml b/roles/k3s_server/tasks/main.yml
index 2c58203..ef4f633 100644
--- a/roles/k3s_server/tasks/main.yml
+++ b/roles/k3s_server/tasks/main.yml
@@ -68,26 +68,11 @@
         state: started
         enabled: true
 
-    - name: Create directory .kube
-      ansible.builtin.file:
-        path: ~{{ ansible_user }}/.kube
-        state: directory
-        owner: "{{ ansible_user }}"
-        mode: "u=rwx,g=rx,o="
-
     - name: Pause to allow first server startup
       when: (groups['server'] | length) > 1
       ansible.builtin.pause:
         seconds: 10
 
-    - name: Copy config file to user home directory
-      ansible.builtin.copy:
-        src: /etc/rancher/k3s/k3s.yaml
-        dest: ~{{ ansible_user }}/.kube/config
-        remote_src: true
-        owner: "{{ ansible_user }}"
-        mode: "u=rw,g=,o="
-
     - name: Add K3s autocomplete to user bashrc
       ansible.builtin.lineinfile:
         path: "~{{ ansible_user }}/.bashrc"
@@ -103,7 +88,7 @@
 
     - name: Copy kubectl config to local machine
       ansible.builtin.fetch:
-        src: ~{{ ansible_user }}/.kube/config
+        src: /etc/rancher/k3s/k3s.yaml
         dest: "{{ kubeconfig }}"
         flat: true
 
@@ -171,11 +156,41 @@
       delay: 10
       changed_when: false
 
-- name: Create symlinks
-  ansible.builtin.file:
-    src: /usr/local/bin/k3s
-    dest: /usr/local/bin/{{ item }}
-    state: link
-  with_items:
-    - kubectl
-    - crictl
+- name: Setup kubectl for user
+  when: user_kubectl
+  block:
+
+    - name: Create kubectl symlink
+      when: lookup('fileglob', '/usr/local/bin/kubectl', errors='warn') | length == 0
+      ansible.builtin.file:
+        src: /usr/local/bin/k3s
+        dest: /usr/local/bin/kubectl
+        state: link
+
+    - name: Create directory .kube
+      ansible.builtin.file:
+        path: ~{{ ansible_user }}/.kube
+        state: directory
+        owner: "{{ ansible_user }}"
+        mode: "u=rwx,g=rx,o="
+
+    - name: Copy config file to user home directory
+      ansible.builtin.copy:
+        src: /etc/rancher/k3s/k3s.yaml
+        dest: ~{{ ansible_user }}/.kube/config
+        remote_src: true
+        owner: "{{ ansible_user }}"
+        mode: "u=rw,g=,o="
+
+    - name: Configure default KUBECONFIG for user
+      ansible.builtin.lineinfile:
+        path: ~{{ ansible_user }}/.bashrc
+        regexp: 'export KUBECONFIG=~/.kube/config'
+        line: 'export KUBECONFIG=~/.kube/config # Added by k3s-ansible'
+        state: present
+
+    - name: Configure kubectl autocomplete
+      ansible.builtin.lineinfile:
+        path: ~{{ ansible_user }}/.bashrc
+        regexp: '\.\s+<\(kubectl completion bash\)'
+        line: ". <(kubectl completion bash)  # Added by k3s-ansible"