From c0ff304f22794ead3139cae5adf849132633a4a5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 21:54:40 -0500 Subject: [PATCH 1/5] chore(deps): bump ansible-core from 2.14.5 to 2.15.2 (#335) Bumps [ansible-core](https://github.com/ansible/ansible) from 2.14.5 to 2.15.2. - [Release notes](https://github.com/ansible/ansible/releases) - [Commits](https://github.com/ansible/ansible/compare/v2.14.5...v2.15.2) --- updated-dependencies: - dependency-name: ansible-core dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 919e7f25..c5580a48 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ # ansible-compat==3.0.1 # via molecule -ansible-core==2.14.5 +ansible-core==2.15.2 # via # -r requirements.in # ansible-compat From 8d61fe81e5c03b3d659736115ac56e2223e0f650 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jul 2023 23:20:55 -0500 Subject: [PATCH 2/5] chore(deps): bump pyyaml from 6.0 to 6.0.1 (#334) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index c5580a48..74326b05 100644 --- a/requirements.txt +++ b/requirements.txt @@ -127,7 +127,7 @@ python-slugify==6.1.2 # via cookiecutter python-vagrant==1.0.0 # via molecule-vagrant -pyyaml==6.0 +pyyaml==6.0.1 # via # -r requirements.in # ansible-compat From bd44a9b126add43c99565f068447d264a9dee6d5 Mon Sep 17 00:00:00 2001 From: Simon Leiner Date: Fri, 21 Jul 2023 07:06:04 +0200 Subject: [PATCH 3/5] Remove unused variable metal_lb_frr_tag_version (#331) --- inventory/sample/group_vars/all.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/inventory/sample/group_vars/all.yml b/inventory/sample/group_vars/all.yml index dbe10482..9a45c30b 100644 --- a/inventory/sample/group_vars/all.yml +++ b/inventory/sample/group_vars/all.yml @@ -55,7 +55,6 @@ metal_lb_mode: "layer2" # metal_lb_bgp_peer_address: "192.168.30.1" # image tag for metal lb -metal_lb_frr_tag_version: "v7.5.1" metal_lb_speaker_tag_version: "v0.13.9" metal_lb_controller_tag_version: "v0.13.9" From 215690b55ba915c699d6bf2213446795af805897 Mon Sep 17 00:00:00 2001 From: Christian Berendt Date: Fri, 21 Jul 2023 23:37:57 +0200 Subject: [PATCH 4/5] Replace hardcoded 'master' group name with 'group_name_master' variable (#337) For improved flexibility and maintainability. * Update tasks in node role to use 'group_name_master' variable instead of hardcoded 'master' group name * Update tasks in master role to use 'group_name_master' variable instead of hardcoded 'master' group name * Update tasks in post role to use 'group_name_master' variable instead of hardcoded 'master' group name Signed-off-by: Christian Berendt --- roles/k3s/node/defaults/main.yml | 3 +++ roles/k3s_agent/templates/k3s.service.j2 | 2 +- roles/k3s_server/defaults/main.yml | 10 +++++++--- roles/k3s_server/tasks/main.yml | 2 +- roles/k3s_server/tasks/metallb.yml | 6 +++--- roles/k3s_server/tasks/vip.yml | 6 +++--- roles/k3s_server_post/defaults/main.yml | 3 +++ roles/k3s_server_post/tasks/metallb.yml | 8 ++++---- 8 files changed, 25 insertions(+), 15 deletions(-) create mode 100644 roles/k3s/node/defaults/main.yml diff --git a/roles/k3s/node/defaults/main.yml b/roles/k3s/node/defaults/main.yml new file mode 100644 index 00000000..a07af663 --- /dev/null +++ b/roles/k3s/node/defaults/main.yml @@ -0,0 +1,3 @@ +--- +# Name of the master group +group_name_master: master diff --git a/roles/k3s_agent/templates/k3s.service.j2 b/roles/k3s_agent/templates/k3s.service.j2 index 67abadbb..3be92e38 100644 --- a/roles/k3s_agent/templates/k3s.service.j2 +++ b/roles/k3s_agent/templates/k3s.service.j2 @@ -7,7 +7,7 @@ After=network-online.target Type=notify ExecStartPre=-/sbin/modprobe br_netfilter ExecStartPre=-/sbin/modprobe overlay -ExecStart=/usr/local/bin/k3s agent --server https://{{ apiserver_endpoint | ansible.utils.ipwrap }}:6443 --token {{ hostvars[groups['master'][0]]['token'] | default(k3s_token) }} {{ extra_agent_args | default("") }} +ExecStart=/usr/local/bin/k3s agent --server https://{{ apiserver_endpoint | ansible.utils.ipwrap }}:6443 --token {{ hostvars[groups[group_name_master | default('master')][0]]['token'] | default(k3s_token) }} {{ extra_agent_args | default("") }} KillMode=process Delegate=yes # Having non-zero Limit*s causes performance problems due to accounting overhead diff --git a/roles/k3s_server/defaults/main.yml b/roles/k3s_server/defaults/main.yml index 9e2fe633..46f1528c 100644 --- a/roles/k3s_server/defaults/main.yml +++ b/roles/k3s_server/defaults/main.yml @@ -4,12 +4,16 @@ # will determine the right interface automatically at runtime. kube_vip_iface: null +# Name of the master group +group_name_master: master + +# yamllint disable rule:line-length server_init_args: >- - {% if groups['master'] | length > 1 %} - {% if ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] %} + {% if groups[group_name_master | default('master')] | length > 1 %} + {% if ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] %} --cluster-init {% else %} - --server https://{{ hostvars[groups['master'][0]].k3s_node_ip | split(",") | first | ansible.utils.ipwrap }}:6443 + --server https://{{ hostvars[groups[group_name_master | default('master')][0]].k3s_node_ip | split(",") | first | ansible.utils.ipwrap }}:6443 {% endif %} --token {{ k3s_token }} {% endif %} diff --git a/roles/k3s_server/tasks/main.yml b/roles/k3s_server/tasks/main.yml index bd81a298..0a8c4b5c 100644 --- a/roles/k3s_server/tasks/main.yml +++ b/roles/k3s_server/tasks/main.yml @@ -33,7 +33,7 @@ command: cmd: k3s kubectl get nodes -l "node-role.kubernetes.io/master=true" -o=jsonpath="{.items[*].metadata.name}" register: nodes - until: nodes.rc == 0 and (nodes.stdout.split() | length) == (groups['master'] | length) + until: nodes.rc == 0 and (nodes.stdout.split() | length) == (groups[group_name_master | default('master')] | length) # yamllint disable-line rule:line-length retries: "{{ retry_count | default(20) }}" delay: 10 changed_when: false diff --git a/roles/k3s_server/tasks/metallb.yml b/roles/k3s_server/tasks/metallb.yml index b6f4fbed..10ff6b59 100644 --- a/roles/k3s_server/tasks/metallb.yml +++ b/roles/k3s_server/tasks/metallb.yml @@ -6,7 +6,7 @@ owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] - name: "Download to first master: manifest for metallb-{{ metal_lb_type }}" ansible.builtin.get_url: @@ -15,7 +15,7 @@ owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] - name: Set image versions in manifest for metallb-{{ metal_lb_type }} ansible.builtin.replace: @@ -27,4 +27,4 @@ to: "metallb/speaker:{{ metal_lb_speaker_tag_version }}" loop_control: label: "{{ item.change }} => {{ item.to }}" - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] diff --git a/roles/k3s_server/tasks/vip.yml b/roles/k3s_server/tasks/vip.yml index dcdc0394..88d4383f 100644 --- a/roles/k3s_server/tasks/vip.yml +++ b/roles/k3s_server/tasks/vip.yml @@ -6,7 +6,7 @@ owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] - name: Download vip rbac manifest to first master ansible.builtin.get_url: @@ -15,7 +15,7 @@ owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] - name: Copy vip manifest to first master template: @@ -24,4 +24,4 @@ owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] + when: ansible_hostname == hostvars[groups[group_name_master | default('master')][0]]['ansible_hostname'] diff --git a/roles/k3s_server_post/defaults/main.yml b/roles/k3s_server_post/defaults/main.yml index a20f9cf8..1c458faa 100644 --- a/roles/k3s_server_post/defaults/main.yml +++ b/roles/k3s_server_post/defaults/main.yml @@ -1,3 +1,6 @@ --- # Timeout to wait for MetalLB services to come up metal_lb_available_timeout: 120s + +# Name of the master group +group_name_master: master diff --git a/roles/k3s_server_post/tasks/metallb.yml b/roles/k3s_server_post/tasks/metallb.yml index 9a6454ef..24219479 100644 --- a/roles/k3s_server_post/tasks/metallb.yml +++ b/roles/k3s_server_post/tasks/metallb.yml @@ -5,7 +5,7 @@ state: directory owner: "{{ ansible_user_id }}" mode: 0755 - with_items: "{{ groups['master'] }}" + with_items: "{{ groups[group_name_master | default('master')] }}" run_once: true - name: Copy metallb CRs manifest to first master @@ -14,14 +14,14 @@ dest: "/tmp/k3s/metallb-crs.yaml" owner: "{{ ansible_user_id }}" mode: 0755 - with_items: "{{ groups['master'] }}" + with_items: "{{ groups[group_name_master | default('master')] }}" run_once: true - name: Test metallb-system namespace command: >- k3s kubectl -n metallb-system changed_when: false - with_items: "{{ groups['master'] }}" + with_items: "{{ groups[group_name_master | default('master')] }}" run_once: true - name: Wait for MetalLB resources @@ -66,7 +66,7 @@ command: >- k3s kubectl -n metallb-system get endpoints webhook-service changed_when: false - with_items: "{{ groups['master'] }}" + with_items: "{{ groups[group_name_master | default('master')] }}" run_once: true - name: Apply metallb CRs From 1aabb5a927d826b8506b8da5b3452dd7258fb5c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 23 Jul 2023 19:32:01 +0000 Subject: [PATCH 5/5] chore(deps): bump jsonpatch from 1.32 to 1.33 (#318) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 74326b05..0604a64a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -68,7 +68,7 @@ jinja2-time==0.2.0 # via cookiecutter jmespath==1.0.1 # via -r requirements.in -jsonpatch==1.32 +jsonpatch==1.33 # via -r requirements.in jsonpointer==2.3 # via jsonpatch