From 65bbc8e2ac9e5a21e7eb3590a0a9cf0865c5aa6e Mon Sep 17 00:00:00 2001 From: Simon Leiner Date: Mon, 20 Feb 2023 04:34:22 +0100 Subject: [PATCH] Simplify download and patching of MetalLB manifests (#239) This removes duplicated code and cleans up Ansible log lines a bit. --- roles/k3s/master/tasks/metallb.yml | 31 +++++------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/roles/k3s/master/tasks/metallb.yml b/roles/k3s/master/tasks/metallb.yml index fa1089f..917b4a8 100644 --- a/roles/k3s/master/tasks/metallb.yml +++ b/roles/k3s/master/tasks/metallb.yml @@ -8,25 +8,16 @@ mode: 0644 when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] -- name: Download metallb manifest to first master +- name: "Download to first master: manifest for metallb-{{ metal_lb_type }}" ansible.builtin.get_url: - url: "https://raw.githubusercontent.com/metallb/metallb/{{ metal_lb_controller_tag_version }}/config/manifests/metallb-native.yaml" # noqa yaml[line-length] + url: "https://raw.githubusercontent.com/metallb/metallb/{{ metal_lb_controller_tag_version }}/config/manifests/metallb-{{metal_lb_type}}.yaml" # noqa yaml[line-length] dest: "/var/lib/rancher/k3s/server/manifests/metallb-crds.yaml" owner: root group: root mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] and metal_lb_type == "native" + when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] -- name: Download metallb-frr manifest to first master - ansible.builtin.get_url: - url: "https://raw.githubusercontent.com/metallb/metallb/{{ metal_lb_controller_tag_version }}/config/manifests/metallb-frr.yaml" # noqa yaml[line-length] - dest: "/var/lib/rancher/k3s/server/manifests/metallb-frr-crds.yaml" - owner: root - group: root - mode: 0644 - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] and metal_lb_type == "frr" - -- name: Set image versions for metallb manifest +- name: Set image versions in manifest for metallb-{{ metal_lb_type }} ansible.builtin.replace: path: "/var/lib/rancher/k3s/server/manifests/metallb-crds.yaml" regexp: "{{ item.change | ansible.builtin.regex_escape }}" @@ -36,16 +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'] and metal_lb_type == "native" - -- name: Set image versions for metallb-frr manifest - ansible.builtin.replace: - path: "/var/lib/rancher/k3s/server/manifests/metallb-frr-crds.yaml" - regexp: "{{ item.change | ansible.builtin.regex_escape }}" - replace: "{{ item.to }}" - with_items: - - change: "metallb/speaker:{{ metal_lb_controller_tag_version }}" - to: "metallb/speaker:{{ metal_lb_speaker_tag_version }}" - loop_control: - label: "{{ item.change }} => {{ item.to }}" - when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname'] and metal_lb_type == "frr" + when: ansible_hostname == hostvars[groups['master'][0]]['ansible_hostname']