Unverified Commit a8b273e2 authored by Derek Nola's avatar Derek Nola
Browse files

Inject installation envs for install script 



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

inventory-sample.yml

+1 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ k3s_cluster: 
    # Optional vars

    # extra_server_args: ""

    # extra_agent_args: ""

    # extra_install_envs: { 'INSTALL_K3S_SKIP_SELINUX_RPM': 'true' }

    # cluster_context: k3s-ansible

    # api_port: 6443

    # k3s_server_location: /var/lib/rancher/k3s

roles/k3s_agent/defaults/main.yml

+1 −0
Original line number Diff line number Diff line
@@ -4,3 +4,4 @@ k3s_server_location: "/var/lib/rancher/k3s" # noqa var-naming[no-role-prefix] 
systemd_dir: "/etc/systemd/system"  # noqa var-naming[no-role-prefix]

api_port: 6443  # noqa var-naming[no-role-prefix]

extra_agent_args: "" # noqa var-naming[no-role-prefix]

extra_install_envs: {} # noqa var-naming[no-role-prefix]

roles/k3s_agent/tasks/main.yml

+11 −5
Original line number Diff line number Diff line
@@ -27,12 +27,18 @@ 
        mode: "0755"



    - name: Download K3s binary

      ansible.builtin.command:

      # For some reason, ansible-lint thinks using enviroment with command is an error

      # even though its valid https://ansible.readthedocs.io/projects/lint/rules/inline-env-var/#correct-code

      ansible.builtin.command: # noqa inline-env-var

        cmd: /usr/local/bin/k3s-install.sh

      environment:

        INSTALL_K3S_SKIP_START: "true"

        INSTALL_K3S_VERSION: "{{ k3s_version }}"

        INSTALL_K3S_EXEC: "agent"

      # Ensures that extra_install_envs are combined with required env vars

      environment: >-

        {{ extra_install_envs | combine({

          "INSTALL_K3S_SKIP_START": "true",

          "INSTALL_K3S_SYSTEMD_DIR": systemd_dir,

          "INSTALL_K3S_VERSION": k3s_version,

          "INSTALL_K3S_EXEC": "agent"

        }) }}

      changed_when: true



- name: Setup optional config file

roles/k3s_server/defaults/main.yml

+1 −0
Original line number Diff line number Diff line
@@ -9,3 +9,4 @@ server_group: server # noqa var-naming[no-role-prefix] 
agent_group: agent  # noqa var-naming[no-role-prefix]

use_external_database: false # noqa var-naming[no-role-prefix]

extra_server_args: "" # noqa var-naming[no-role-prefix]

extra_install_envs: {} # noqa var-naming[no-role-prefix]

roles/k3s_server/tasks/main.yml

+9 −4
Original line number Diff line number Diff line
@@ -27,11 +27,16 @@ 
        mode: "0755"



    - name: Download K3s binary

      ansible.builtin.command:

      # For some reason, ansible-lint thinks using enviroment with command is an error

      # even though its valid https://ansible.readthedocs.io/projects/lint/rules/inline-env-var/#correct-code

      ansible.builtin.command: # noqa inline-env-var

        cmd: /usr/local/bin/k3s-install.sh

      environment:

        INSTALL_K3S_SKIP_START: "true"

        INSTALL_K3S_VERSION: "{{ k3s_version }}"

      # Ensures that extra_install_envs are combined with required env vars

      environment: >-

        {{ extra_install_envs | combine({

          "INSTALL_K3S_SKIP_START": "true",

          "INSTALL_K3S_VERSION": k3s_version,

        }) }}

      changed_when: true



- name: Add K3s autocomplete to user bashrc