Unverified Commit 937f20d9 authored by Vincent RABAH's avatar Vincent RABAH Committed by GitHub
Browse files

Revert "Add Alpine Linux configuration"

parent dbbdfdff

roles/k3s/master/tasks/main.yml

+16 −6
Original line number Diff line number Diff line 
---



- name: Create and enable K3s service

  include_tasks: "{{ item }}"

  with_first_found:

    - "prereq/{{ ansible_distribution }}.yml"

    - "prereq/default.yml"

- name: Copy K3s service file

  register: k3s_service

  template:

    src: "k3s.service.j2"

    dest: "{{ systemd_dir }}/k3s.service"

    owner: root

    group: root

    mode: 0755



- name: Enable and check K3s service

  systemd:

    name: k3s

    daemon_reload: yes

    state: restarted

    enabled: yes



- name: Wait for node-token

  wait_for:
@@ -51,7 +61,7 @@ 


- name: Replace https://localhost:6443 by https://master-ip:6443

  command: >-

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

    k3s kubectl config set-cluster default

      --server=https://{{ master_ip }}:6443

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

  changed_when: true

roles/k3s/master/tasks/prereq/Alpine.yml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
---

- name: Copy K3s service file

  register: k3s_service

  copy:

    content: |

      #!/sbin/openrc-run



      name="k3s server"

      command="/usr/local/bin/k3s"

      command_args="server {{ extra_server_args | default("") }}"

      command_background=true

      pidfile="/run/${RC_SVCNAME}.pid"

      output_log="/var/log/k3s.log"

      error_log="/var/log/k3s.err"

    dest: /etc/init.d/k3s

    owner: root

    group: root

    mode: 0755



- name: Create K3s service symlink

  file:

    src: /etc/init.d/k3s

    dest: /etc/runlevels/default/k3s

    state: link



- name: Enable and check K3s service

  service:

    name: k3s

    state: restarted

    enabled: yes

roles/k3s/master/tasks/prereq/default.yml

deleted100644 → 0
+0 −16
Original line number Diff line number Diff line 
---

- name: Copy K3s service file

  register: k3s_service

  template:

    src: "k3s.service.j2"

    dest: "{{ systemd_dir }}/k3s.service"

    owner: root

    group: root

    mode: 0755



- name: Enable and check K3s service

  systemd:

    name: k3s

    daemon_reload: yes

    state: restarted

    enabled: yes

roles/k3s/node/tasks/main.yml

+14 −5
Original line number Diff line number Diff line 
---



- name: Create and enable K3s service

  include_tasks: "{{ item }}"

  with_first_found:

    - "prereq/{{ ansible_distribution }}.yml"

    - "prereq/default.yml"
 
- name: Copy K3s service file

  template:

    src: "k3s.service.j2"

    dest: "{{ systemd_dir }}/k3s-node.service"

    owner: root

    group: root

    mode: 0755



- name: Enable and check K3s service

  systemd:

    name: k3s-node

    daemon_reload: yes

    state: restarted

    enabled: yes

roles/k3s/node/tasks/prereq/Alpine.yml

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
---

- name: Copy K3s service file

  register: k3s_service

  copy:

    content: |

      #!/sbin/openrc-run



      name="k3s agent"

      command="/usr/local/bin/k3s"

      command_args="agent --server https://{{ master_ip }}:6443 --token {{ hostvars[groups['master'][0]]['token'] }} {{ extra_agent_args | default("") }}"

      command_background=true

      pidfile="/run/${RC_SVCNAME}.pid"

      output_log="/var/log/k3s.log"

      error_log="/var/log/k3s.err"

    dest: /etc/init.d/k3s

    owner: root

    group: root

    mode: 0755



- name: Create K3s service symlink

  file:

    src: /etc/init.d/k3s

    dest: /etc/runlevels/default/k3s

    state: link



- name: Enable and check K3s service

  service:

    name: k3s

    state: restarted

    enabled: yes



- name: lbu

  debug:

    msg: Remember to commit changes with 'lbu ci -d' to store the k3s passwords