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

feat: remove the need for raw jinja blocks (#1158)

Browse Source 
Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed 2024-01-15 00:03:41 -05:00
1 parent f9481d6202
commit e6fbc6e128
92 files changed
+430 -441
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/templates/kubernetes/flux/config/cluster.yaml.j2
+6 -6
View File
@@ -7,14 +7,14 @@ metadata:
spec:
interval: 30m
ref:
branch: {{ bootstrap_github_repository_branch | default('main', true) }}
{% if bootstrap_private_github_repo | default(false) %}
branch: << bootstrap_github_repository_branch | default('main', true) >>
<% if bootstrap_private_github_repo | default(false) %>
secretRef:
name: github-deploy-key
url: "ssh://github.com/{{ bootstrap_github_username }}/{{ bootstrap_github_repository_name }}"
{% else %}
url: "https://github.com/{{ bootstrap_github_username }}/{{ bootstrap_github_repository_name }}.git"
{% endif %}
url: "ssh://github.com/<< bootstrap_github_username >>/<< bootstrap_github_repository_name >>"
<% else %>
url: "https://github.com/<< bootstrap_github_username >>/<< bootstrap_github_repository_name >>.git"
<% endif %>
ignore: |
# exclude all
/*
bootstrap/templates/kubernetes/flux/vars/cluster-secrets.sops.yaml.j2
+3 -3
View File
@@ -5,6 +5,6 @@ metadata:
name: cluster-secrets
namespace: flux-system
stringData:
SECRET_DOMAIN: "{{ bootstrap_cloudflare_domain }}"
SECRET_ACME_EMAIL: "{{ bootstrap_acme_email }}"
SECRET_CLOUDFLARE_TUNNEL_ID: "{{ bootstrap_cloudflare_tunnel_id }}"
SECRET_DOMAIN: "<< bootstrap_cloudflare_domain >>"
SECRET_ACME_EMAIL: "<< bootstrap_acme_email >>"
SECRET_CLOUDFLARE_TUNNEL_ID: "<< bootstrap_cloudflare_tunnel_id >>"
bootstrap/templates/kubernetes/flux/vars/cluster-settings.yaml.j2
+14 -14
View File
@@ -5,17 +5,17 @@ metadata:
name: cluster-settings
namespace: flux-system
data:
TIMEZONE: "{{ bootstrap_timezone }}"
COREDNS_ADDR: "{{ bootstrap_service_cidr.split(',')[0] | nthhost(10) }}"
{% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %}
KUBE_API_ADDR: "{{ bootstrap_nodes.master[0].address }}"
{% else %}
KUBE_API_ADDR: "{{ bootstrap_kube_api_addr }}"
{% endif %}
CLUSTER_CIDR: "{{ bootstrap_cluster_cidr.split(',')[0] }}"
SERVICE_CIDR: "{{ bootstrap_service_cidr.split(',')[0] }}"
NODE_CIDR: "{{ bootstrap_node_cidr }}"
{% if bootstrap_ipv6_enabled | default(false) %}
CLUSTER_CIDR_V6: "{{ bootstrap_cluster_cidr.split(',')[1] }}"
SERVICE_CIDR_V6: "{{ bootstrap_service_cidr.split(',')[1] }}"
{% endif %}
TIMEZONE: "<< bootstrap_timezone >>"
COREDNS_ADDR: "<< bootstrap_service_cidr.split(',')[0] | nthhost(10) >>"
<% if bootstrap_nodes.master | length == 1 and not bootstrap_kube_api_addr %>
KUBE_API_ADDR: "<< bootstrap_nodes.master[0].address >>"
<% else %>
KUBE_API_ADDR: "<< bootstrap_kube_api_addr >>"
<% endif %>
CLUSTER_CIDR: "<< bootstrap_cluster_cidr.split(',')[0] >>"
SERVICE_CIDR: "<< bootstrap_service_cidr.split(',')[0] >>"
NODE_CIDR: "<< bootstrap_node_cidr >>"
<% if bootstrap_ipv6_enabled | default(false) %>
CLUSTER_CIDR_V6: "<< bootstrap_cluster_cidr.split(',')[1] >>"
SERVICE_CIDR_V6: "<< bootstrap_service_cidr.split(',')[1] >>"
<% endif %>