Unverified Commit fd6f288b authored by Derek Nola's avatar Derek Nola Committed by GitHub
Browse files

Fix K3s Path, Alternative folder in HA (#233) 



* Readd #143 fix

Signed-off-by: default avatarDerek Nola <derek.nola@suse.com>

* Add PR template

Signed-off-by: default avatarDerek Nola <derek.nola@suse.com>
parent f369e3a0

.github/workflows/pull_request_template.md

0 → 100644
+3 −0
Original line number Diff line number Diff line 
#### Changes ####



#### Linked Issues ####
 
 No newline at end of file

Vagrantfile

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ def provision(vm, role, node_num) 
      # Required to use the private network configured above

      extra_server_args: "--node-external-ip #{node_ip} --flannel-iface eth1", 

      extra_agent_args: "--node-external-ip #{node_ip} --flannel-iface eth1",

      k3s_server_location: "/data/k3s",

    }

  end

end

roles/k3s/server/tasks/main.yml

+2 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
        mode: "u=rwx,g=rx,o="



    - name: Pause to allow server startup

      when: (groups['server'] | length) > 1

      ansible.builtin.pause:

        seconds: 10
@@ -48,7 +49,7 @@ 


    - name: Change server to API endpoint instead of localhost

      ansible.builtin.command: >-

        k3s kubectl config set-cluster default

         /usr/local/bin/k3s kubectl config set-cluster default

          --server=https://{{ api_endpoint }}:{{ api_port }}

          --kubeconfig ~{{ ansible_user }}/.kube/config

      changed_when: true

roles/prereq/tasks/main.yml

+13 −6
Original line number Diff line number Diff line
@@ -59,12 +59,19 @@ 
    validate: 'visudo -cf %s'

  when: ansible_distribution in ['CentOS', 'Red Hat Enterprise Linux','RedHat']



- name: Setup alternative K3s directory

  when:

    - k3s_server_location is defined

    - k3s_server_location != "/var/lib/rancher/k3s"

  block:

    - name: Make rancher directory

      ansible.builtin.file:

        path: "/var/lib/rancher"

        mode: 0755

        state: directory

    - name: Create symlink

      ansible.builtin.file:

        dest: /var/lib/rancher/k3s

        src: "{{ k3s_server_location }}"

        force: true

        state: link
 
  when:

    - k3s_server_location is defined

    - k3s_server_location != "/var/lib/rancher/k3s"