Merge 717971a707 into b86156b995

molecule/cilium/overrides.yml

@@ -6,7 +6,7 @@
       ansible.builtin.set_fact:
         # See:
         # https://github.com/flannel-io/flannel/blob/67d603aaf45ef80f5dd39f43714fc5e6f8a637eb/Documentation/troubleshooting.md#Vagrant
-        cilium_iface: eth0
+        cilium_iface: eth1
 
         # The test VMs might be a bit slow, so we give them more time to join the cluster:
         retry_count: 45

roles/k3s_server/tasks/main.yml

@@ -29,7 +29,7 @@
 - name: Deploy metallb manifest
   include_tasks: metallb.yml
   tags: metallb
-  when: kube_vip_lb_ip_range is not defined and (cilium_bgp is not defined or cilium_iface is not defined)
+  when: kube_vip_lb_ip_range is not defined and (not cilium_bgp or cilium_iface is not defined)
 
 - name: Deploy kube-vip manifest
   include_tasks: kube-vip.yml

roles/k3s_server_post/tasks/cilium.yml

@@ -221,9 +221,10 @@
     - name: Configure Cilium BGP
       when: cilium_bgp
       block:
+
         - name: Copy BGP manifests to first master
           ansible.builtin.template:
-            src: "cilium-bgp.crs.j2"
+            src: "cilium.crs.j2"
             dest: /tmp/k3s/cilium-bgp.yaml
             owner: root
             group: root
@@ -246,37 +247,6 @@
           ansible.builtin.command: "{{ item }}"
           loop:
             - k3s kubectl get CiliumBGPPeeringPolicy.cilium.io
-          changed_when: false
-          loop_control:
-            label: "{{ item }}"
-
-    - name: Configure Cilium Load Balancer
-      when: cilium_iface
-      block:
-        - name: Copy Load Balancer manifests to first master
-          ansible.builtin.template:
-            src: "cilium-lb.crs.j2"
-            dest: /tmp/k3s/cilium-lb.yaml
-            owner: root
-            group: root
-            mode: 0755
-
-        - name: Apply LB manifests
-          ansible.builtin.command:
-            cmd: kubectl apply -f /tmp/k3s/cilium-lb.yaml
-          register: apply_cr
-          changed_when: "'configured' in apply_cr.stdout or 'created' in apply_cr.stdout"
-          failed_when: "'is invalid' in apply_cr.stderr"
-          ignore_errors: true
-
-        - name: Print error message if LB manifests application fails
-          ansible.builtin.debug:
-            msg: "{{ apply_cr.stderr }}"
-          when: "'is invalid' in apply_cr.stderr"
-
-        - name: Test for LB config resources
-          ansible.builtin.command: "{{ item }}"
-          loop:
             - k3s kubectl get CiliumLoadBalancerIPPool.cilium.io
           changed_when: false
           loop_control:

roles/k3s_server_post/tasks/main.yml

@@ -12,7 +12,7 @@
 - name: Deploy metallb pool
   include_tasks: metallb.yml
   tags: metallb
-  when: kube_vip_lb_ip_range is not defined and (cilium_bgp is not defined or cilium_iface is not defined)
+  when: kube_vip_lb_ip_range is not defined and (not cilium_bgp or cilium_iface is not defined)
 
 - name: Remove tmp directory used for manifests
   file:

roles/k3s_server_post/templates/cilium-lb.crs.j2

@@ -1,13 +0,0 @@
----
-apiVersion: "cilium.io/v2alpha1"
-kind: CiliumLoadBalancerIPPool
-metadata:
-  name: "01-lb-pool"
-spec:
-  blocks:
-{% if "/" in cilium_bgp_lb_cidr %}
-  - cidr: {{ cilium_bgp_lb_cidr }}
-{% else %}
-  - start: {{ cilium_bgp_lb_cidr.split('-')[0] }}
-    stop: {{ cilium_bgp_lb_cidr.split('-')[1] }}
-{% endif %}

roles/k3s_server_post/templates/cilium.crs.j2

@@ -19,3 +19,16 @@ spec: # CiliumBGPPeeringPolicySpec
    serviceSelector:
       matchExpressions:
          - {key: somekey, operator: NotIn, values: ['never-used-value']}
+---
+apiVersion: "cilium.io/v2alpha1"
+kind: CiliumLoadBalancerIPPool
+metadata:
+  name: "01-lb-pool"
+spec:
+  blocks:
+{% if "/" in cilium_bgp_lb_cidr %}
+  - cidr: {{ cilium_bgp_lb_cidr }}
+{% else %}
+  - start: {{ cilium_bgp_lb_cidr.split('-')[0] }}
+    stop: {{ cilium_bgp_lb_cidr.split('-')[1] }}
+{% endif %}