diff --git a/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 b/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 index d28be378..15404bb5 100644 --- a/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 +++ b/bootstrap/templates/ansible/k3s/playbooks/cluster-installation.yaml.j2 @@ -46,12 +46,8 @@ wait_sleep: 10 wait_timeout: 360 loop: - - { name: cilium, kind: HelmChart, namespace: kube-system } + - { name: cilium, kind: HelmChart, namespace: kube-system } - { name: coredns, kind: HelmChart, namespace: kube-system } - {% if not bootstrap_ipv6_enabled | default(false) %} - - { name: policy, kind: CiliumL2AnnouncementPolicy } - - { name: pool, kind: CiliumLoadBalancerIPPool } - {% endif %} - name: Coredns when: k3s_primary_control_node diff --git a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-l2.yaml.j2.j2 b/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-l2.yaml.j2.j2 deleted file mode 100644 index 51415a66..00000000 --- a/bootstrap/templates/ansible/k3s/playbooks/templates/custom-cilium-l2.yaml.j2.j2 +++ /dev/null @@ -1,22 +0,0 @@ ---- -# https://docs.cilium.io/en/latest/network/l2-announcements -apiVersion: cilium.io/v2alpha1 -kind: CiliumL2AnnouncementPolicy -metadata: - name: policy -spec: - loadBalancerIPs: true - # NOTE: This might need to be set if you have more than one active NIC on your nodes - # interfaces: - # - ^eno[0-9]+ - nodeSelector: - matchLabels: - kubernetes.io/os: linux ---- -apiVersion: cilium.io/v2alpha1 -kind: CiliumLoadBalancerIPPool -metadata: - name: pool -spec: - cidrs: - - cidr: "{% raw %}{{ node_cidr }}{% endraw %}"