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

chore: update logic in cilium helmchart and var ordering

Browse Source 
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl committed 2023-07-17 18:04:58 -04:00
1 parent cac08d6368
commit bd2b24aad0
2 files changed
+12 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/tasks/validation/vars.yaml
+12 -11
View File
@@ -6,23 +6,24 @@
success_msg: Required bootstrap var {{ item }} exists and is defined success_msg: Required bootstrap var {{ item }} exists and is defined
fail_msg: Required bootstrap var {{ item }} does not exists or is not defined fail_msg: Required bootstrap var {{ item }} does not exists or is not defined
loop: loop:
- bootstrap_github_username
- bootstrap_github_repository_name
- bootstrap_age_public_key
- bootstrap_timezone
- bootstrap_acme_email - bootstrap_acme_email
- bootstrap_flux_github_webhook_token - bootstrap_age_public_key
- bootstrap_cloudflare_account_tag
- bootstrap_cloudflare_domain - bootstrap_cloudflare_domain
- bootstrap_cloudflare_token - bootstrap_cloudflare_token
- bootstrap_cloudflare_account_tag
- bootstrap_cloudflare_tunnel_secret
- bootstrap_cloudflare_tunnel_id - bootstrap_cloudflare_tunnel_id
- bootstrap_node_cidr - bootstrap_cloudflare_tunnel_secret
- bootstrap_k8s_gateway_addr
- bootstrap_ingress_nginx_addr
- bootstrap_kube_vip_addr
- bootstrap_cluster_cidr - bootstrap_cluster_cidr
- bootstrap_flux_github_webhook_token
- bootstrap_github_repository_name
- bootstrap_github_username
- bootstrap_ingress_nginx_addr
- bootstrap_ipv6_enabled
- bootstrap_k8s_gateway_addr
- bootstrap_kube_vip_addr
- bootstrap_node_cidr
- bootstrap_service_cidr - bootstrap_service_cidr
- bootstrap_timezone
- name: Verify bootstrap node names are valid - name: Verify bootstrap node names are valid
ansible.builtin.assert: ansible.builtin.assert:
bootstrap/templates/ansible/playbooks/templates/custom-coredns-helmchart.yaml.j2.j2
-4
View File
@@ -20,11 +20,7 @@ spec:
service: service:
name: kube-dns name: kube-dns
# Choose the 10th IP address from the start of the service-cidr # Choose the 10th IP address from the start of the service-cidr
{% if bootstrap_ipv6_enabled | default(false) %}
clusterIP: "{% raw %}{{ k3s_server['service-cidr'].split(',')[0] | ansible.utils.nthhost(10) }}{% endraw %}" clusterIP: "{% raw %}{{ k3s_server['service-cidr'].split(',')[0] | ansible.utils.nthhost(10) }}{% endraw %}"
{% else %}
clusterIP: "{% raw %}{{ k3s_server['service-cidr'] | ansible.utils.nthhost(10) }}{% endraw %}"
{% endif %}
serviceAccount: serviceAccount:
create: true create: true
deployment: deployment: