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

refactor!: project updates (#1326)

Browse Source 
* refactor!: flux is required again

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: delimiter that chomps

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: bootstrap_cloudflare logic

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: update tests

Signed-off-by: Devin Buhl <devin@buhl.casa>

* fix: remove last quote

Signed-off-by: Devin Buhl <devin@buhl.casa>

* chore: update readme

Signed-off-by: Devin Buhl <devin@buhl.casa>

---------

Signed-off-by: Devin Buhl <devin@buhl.casa>
This commit is contained in:
Devin Buhl authored and GitHub committed 2024-02-15 20:03:24 -05:00
1 parent 04ff4ef994
commit c17d543b21
93 files changed
+591 -755
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

bootstrap/templates/kubernetes/apps/network/.mjfilter.py
+1 -1
View File
@@ -1 +1 @@
main = lambda data: data.get("cloudflare", {}).get("enabled", False) == True
main = lambda data: data.get("bootstrap_cloudflare", {}).get("enabled", False) == True
bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2
+4 -4
View File
@@ -4,10 +4,10 @@ kind: Secret
metadata:
name: cloudflared-secret
stringData:
TUNNEL_ID: "{{ cloudflare.tunnel.id }}"
TUNNEL_ID: "#{ bootstrap_cloudflare.tunnel.id }#"
credentials.json: |
{
"AccountTag": "{{ cloudflare.tunnel.account_id }}",
"TunnelSecret": "{{ cloudflare.tunnel.secret }}",
"TunnelID": "{{ cloudflare.tunnel.id }}"
"AccountTag": "#{ bootstrap_cloudflare.tunnel.account_id }#",
"TunnelSecret": "#{ bootstrap_cloudflare.tunnel.secret }#",
"TunnelID": "#{ bootstrap_cloudflare.tunnel.id }#"
}
bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
+2 -2
View File
@@ -82,7 +82,7 @@ spec:
annotations:
external-dns.alpha.kubernetes.io/target: "external.${SECRET_DOMAIN}"
hosts:
- host: &host "{% raw %}{{ .Release.Name }}{% endraw %}-external.${SECRET_DOMAIN}"
- host: &host "{{ .Release.Name }}-external.${SECRET_DOMAIN}"
paths:
- path: /
service:
@@ -95,7 +95,7 @@ spec:
enabled: true
className: internal
hosts:
- host: &host "{% raw %}{{ .Release.Name }}{% endraw %}-internal.${SECRET_DOMAIN}"
- host: &host "{{ .Release.Name }}-internal.${SECRET_DOMAIN}"
paths:
- path: /
service:
bootstrap/templates/kubernetes/apps/network/external-dns/app/secret.sops.yaml.j2
+1 -1
View File
@@ -4,4 +4,4 @@ kind: Secret
metadata:
name: external-dns-secret
stringData:
api-token: "{{ cloudflare.token }}"
api-token: "#{ bootstrap_cloudflare.token }#"
bootstrap/templates/kubernetes/apps/network/ingress-nginx/certificates/kustomization.yaml.j2
+2 -2
View File
@@ -3,6 +3,6 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- ./staging.yaml
{% if cloudflare.acme.production %}
#% if bootstrap_cloudflare.acme.production %#
- ./production.yaml
{% endif %}
#% endif %#
bootstrap/templates/kubernetes/apps/network/ingress-nginx/external/helmrelease.yaml.j2
Vendored
+4 -4
View File
@@ -32,7 +32,7 @@ spec:
service:
annotations:
external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
io.cilium/lb-ipam-ips: "{{ cloudflare.tunnel.ingress_vip }}"
io.cilium/lb-ipam-ips: "#{ bootstrap_cloudflare.tunnel.ingress_vip }#"
externalTrafficPolicy: Cluster
ingressClassResource:
name: external
@@ -70,11 +70,11 @@ spec:
namespaceSelector:
any: true
extraArgs:
{% if cloudflare.acme.production %}
#% if bootstrap_cloudflare.acme.production %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
{% else %}
#% else %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
{% endif %}
#% endif %#
topologySpreadConstraints:
- maxSkew: 1
topologyKey: kubernetes.io/hostname
bootstrap/templates/kubernetes/apps/network/ingress-nginx/internal/helmrelease.yaml.j2
+4 -4
View File
@@ -29,7 +29,7 @@ spec:
replicaCount: 1
service:
annotations:
io.cilium/lb-ipam-ips: "{{ cloudflare.ingress_vip }}"
io.cilium/lb-ipam-ips: "#{ bootstrap_cloudflare.ingress_vip }#"
externalTrafficPolicy: Cluster
ingressClassResource:
name: internal
@@ -67,11 +67,11 @@ spec:
namespaceSelector:
any: true
extraArgs:
{% if cloudflare.acme.production %}
#% if bootstrap_cloudflare.acme.production %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-production-tls"
{% else %}
#% else %#
default-ssl-certificate: "network/${SECRET_DOMAIN/./-}-staging-tls"
{% endif %}
#% endif %#
topologySpreadConstraints:
- maxSkew: 1
topologyKey: kubernetes.io/hostname
bootstrap/templates/kubernetes/apps/network/k8s-gateway/app/helmrelease.yaml.j2
+1 -1
View File
@@ -30,5 +30,5 @@ spec:
type: LoadBalancer
port: 53
annotations:
io.cilium/lb-ipam-ips: "{{ cloudflare.gateway_vip }}"
io.cilium/lb-ipam-ips: "#{ bootstrap_cloudflare.gateway_vip }#"
externalTrafficPolicy: Cluster