infra/home-cluster
2
0 Fork 0
Code Issues Pull Requests 40 Actions Packages Projects Releases Wiki Activity

fix: when IPv6 is enabled cilium l2 CRs are not needed

Browse Source 
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl committed 2023-07-17 17:21:01 -04:00
1 parent 1b020d8fb5
commit 9391b0f15f
2 files changed
+6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/templates/ansible/inventory/group_vars/kubernetes/main.yaml.j2
+3
View File
@@ -1,3 +1,4 @@
#jinja2: trim_blocks: True, lstrip_blocks: True
--- ---
# #
# Below vars are for the xanmanning.k3s role # Below vars are for the xanmanning.k3s role
@@ -25,7 +26,9 @@ k3s_server_manifests_urls:
# /var/lib/rancher/k3s/server/manifests # /var/lib/rancher/k3s/server/manifests
k3s_server_manifests_templates: k3s_server_manifests_templates:
- custom-cilium-helmchart.yaml.j2 - custom-cilium-helmchart.yaml.j2
{% if bootstrap_ipv6_enabled | default(false) %}
- custom-cilium-l2.yaml.j2 - custom-cilium-l2.yaml.j2
{% endif %}
- custom-coredns-helmchart.yaml.j2 - custom-coredns-helmchart.yaml.j2
# /var/lib/rancher/k3s/agent/pod-manifests # /var/lib/rancher/k3s/agent/pod-manifests
k3s_server_pod_manifests_templates: k3s_server_pod_manifests_templates:
bootstrap/templates/ansible/playbooks/cluster-installation.yaml.j2
+3
View File
@@ -1,3 +1,4 @@
#jinja2: trim_blocks: True, lstrip_blocks: True
--- ---
- name: Cluster Installation - name: Cluster Installation
hosts: all hosts: all
@@ -47,8 +48,10 @@
loop: loop:
- { name: cilium, kind: HelmChart, namespace: kube-system } - { name: cilium, kind: HelmChart, namespace: kube-system }
- { name: coredns, kind: HelmChart, namespace: kube-system } - { name: coredns, kind: HelmChart, namespace: kube-system }
{% if bootstrap_ipv6_enabled | default(false) %}
- { name: policy, kind: CiliumL2AnnouncementPolicy } - { name: policy, kind: CiliumL2AnnouncementPolicy }
- { name: pool, kind: CiliumLoadBalancerIPPool } - { name: pool, kind: CiliumLoadBalancerIPPool }
{% endif %}
- { name: podmonitors.monitoring.coreos.com, kind: CustomResourceDefinition } - { name: podmonitors.monitoring.coreos.com, kind: CustomResourceDefinition }
- { name: prometheusrules.monitoring.coreos.com, kind: CustomResourceDefinition } - { name: prometheusrules.monitoring.coreos.com, kind: CustomResourceDefinition }
- { name: servicemonitors.monitoring.coreos.com, kind: CustomResourceDefinition } - { name: servicemonitors.monitoring.coreos.com, kind: CustomResourceDefinition }