feat: change jinja variable start/end delimiters to avoid conflicts with go templating (#1168)
* feat: change jinja variable start/end delimiters to avoid conflicts with go templating Signed-off-by: Devin Buhl <devin@buhl.casa> * chore: update comment in makejinja.toml Signed-off-by: Devin Buhl <devin@buhl.casa> * chore: update comment in makejinja.toml 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
1 parent
9317007e7f
commit
646f335689
25 files changed
+80
-79
No files matched your search
+1
-1
@@ -4,4 +4,4 @@ kind: Secret
|
||||
metadata:
|
||||
name: cert-manager-secret
|
||||
stringData:
|
||||
api-token: "{% bootstrap_cloudflare_token %}"
|
||||
api-token: "#{ bootstrap_cloudflare_token }#"
|
||||
+1
-1
@@ -12,5 +12,5 @@ stringData:
|
||||
interval = "10m"
|
||||
retry_limit = 5
|
||||
sink.type = "discord"
|
||||
sink.url = "{% discord_template_notifier.webhook_url %}"
|
||||
sink.url = "#{ discord_template_notifier.webhook_url }#"
|
||||
#% endif %#
|
||||
@@ -5,9 +5,9 @@ kind: Secret
|
||||
metadata:
|
||||
name: homepage-secret
|
||||
stringData:
|
||||
HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID: "{% bootstrap_cloudflare_account_tag %}"
|
||||
HOMEPAGE_VAR_CLOUDFLARED_TUNNELID: "{% bootstrap_cloudflare_tunnel_id %}"
|
||||
HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN: "{% bootstrap_cloudflare_token %}"
|
||||
HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID: "#{ bootstrap_cloudflare_account_tag }#"
|
||||
HOMEPAGE_VAR_CLOUDFLARED_TUNNELID: "#{ bootstrap_cloudflare_tunnel_id }#"
|
||||
HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN: "#{ bootstrap_cloudflare_token }#"
|
||||
HOMEPAGE_VAR_GRAFANA_USERNAME: admin
|
||||
HOMEPAGE_VAR_GRAFANA_PASSWORD: "{% grafana.password %}"
|
||||
HOMEPAGE_VAR_GRAFANA_PASSWORD: "#{ grafana.password }#"
|
||||
#% endif %#
|
||||
+1
-1
@@ -4,4 +4,4 @@ kind: Secret
|
||||
metadata:
|
||||
name: github-webhook-token-secret
|
||||
stringData:
|
||||
token: "{% bootstrap_flux_github_webhook_token %}"
|
||||
token: "#{ bootstrap_flux_github_webhook_token }#"
|
||||
+1
-1
@@ -7,5 +7,5 @@ metadata:
|
||||
type: Opaque
|
||||
stringData:
|
||||
username: admin
|
||||
password: "{% weave_gitops.password | encrypt %}"
|
||||
password: "#{ weave_gitops.password | encrypt }#"
|
||||
#% endif %#
|
||||
@@ -106,7 +106,7 @@ spec:
|
||||
#% endif %#
|
||||
loadBalancer:
|
||||
algorithm: maglev
|
||||
mode: "{% bootstrap_cilium_loadbalancer_mode | default('dsr', true) %}"
|
||||
mode: "#{ bootstrap_cilium_loadbalancer_mode | default('dsr', true) }#"
|
||||
localRedirectPolicy: true
|
||||
operator:
|
||||
replicas: 1
|
||||
|
||||
@@ -4,10 +4,10 @@ kind: Secret
|
||||
metadata:
|
||||
name: cloudflared-secret
|
||||
stringData:
|
||||
TUNNEL_ID: "{% bootstrap_cloudflare_tunnel_id %}"
|
||||
TUNNEL_ID: "#{ bootstrap_cloudflare_tunnel_id }#"
|
||||
credentials.json: |
|
||||
{
|
||||
"AccountTag": "{% bootstrap_cloudflare_account_tag %}",
|
||||
"TunnelSecret": "{% bootstrap_cloudflare_tunnel_secret %}",
|
||||
"TunnelID": "{% bootstrap_cloudflare_tunnel_id %}"
|
||||
"AccountTag": "#{ bootstrap_cloudflare_account_tag }#",
|
||||
"TunnelSecret": "#{ bootstrap_cloudflare_tunnel_secret }#",
|
||||
"TunnelID": "#{ bootstrap_cloudflare_tunnel_id }#"
|
||||
}
|
||||
@@ -4,4 +4,4 @@ kind: Secret
|
||||
metadata:
|
||||
name: external-dns-secret
|
||||
stringData:
|
||||
api-token: "{% bootstrap_cloudflare_token %}"
|
||||
api-token: "#{ bootstrap_cloudflare_token }#"
|
||||
@@ -31,5 +31,5 @@ spec:
|
||||
type: LoadBalancer
|
||||
port: 53
|
||||
annotations:
|
||||
io.cilium/lb-ipam-ips: "{% bootstrap_k8s_gateway_addr %}"
|
||||
io.cilium/lb-ipam-ips: "#{ bootstrap_k8s_gateway_addr }#"
|
||||
externalTrafficPolicy: Cluster
|
||||
+1
-1
@@ -33,7 +33,7 @@ spec:
|
||||
service:
|
||||
annotations:
|
||||
external-dns.alpha.kubernetes.io/hostname: "external.${SECRET_DOMAIN}"
|
||||
io.cilium/lb-ipam-ips: "{% bootstrap_external_ingress_addr %}"
|
||||
io.cilium/lb-ipam-ips: "#{ bootstrap_external_ingress_addr }#"
|
||||
externalTrafficPolicy: Cluster
|
||||
ingressClassResource:
|
||||
name: external
|
||||
|
||||
@@ -31,7 +31,7 @@ spec:
|
||||
service:
|
||||
annotations:
|
||||
external-dns.alpha.kubernetes.io/hostname: "internal.${SECRET_DOMAIN}"
|
||||
io.cilium/lb-ipam-ips: "{% bootstrap_internal_ingress_addr %}"
|
||||
io.cilium/lb-ipam-ips: "#{ bootstrap_internal_ingress_addr }#"
|
||||
externalTrafficPolicy: Cluster
|
||||
ingressClassResource:
|
||||
name: internal
|
||||
|
||||
@@ -6,5 +6,5 @@ metadata:
|
||||
name: grafana-admin-secret
|
||||
stringData:
|
||||
admin-user: admin
|
||||
admin-password: "{% grafana.password %}"
|
||||
admin-password: "#{ grafana.password }#"
|
||||
#% endif %#
|
||||
+1
-1
@@ -92,7 +92,7 @@ spec:
|
||||
enabled: true
|
||||
endpoints: &endpoints
|
||||
#% for item in bootstrap_nodes.master %#
|
||||
- "{% item.address %}"
|
||||
- "#{ item.address }#"
|
||||
#% endfor %#
|
||||
#% if bootstrap_distribution == 'k3s' %#
|
||||
serviceMonitor:
|
||||
|
||||
@@ -4,11 +4,11 @@
|
||||
apiVersion: storage.k8s.io/v1
|
||||
kind: StorageClass
|
||||
metadata:
|
||||
name: "{% item.name %}"
|
||||
name: "#{ item.name }#"
|
||||
provisioner: nfs.csi.k8s.io
|
||||
parameters:
|
||||
server: "{% item.server %}"
|
||||
share: "{% item.share %}"
|
||||
server: "#{ item.server }#"
|
||||
share: "#{ item.share }#"
|
||||
reclaimPolicy: Delete
|
||||
volumeBindingMode: Immediate
|
||||
mountOptions: ["hard", "noatime"]
|
||||
|
||||
@@ -29,5 +29,5 @@ spec:
|
||||
enabled: true
|
||||
name: openebs-hostpath
|
||||
isDefaultClass: false
|
||||
basePath: "{% bootstrap_local_storage_path %}"
|
||||
basePath: "#{ bootstrap_local_storage_path }#"
|
||||
|
||||
Reference in new issue
Block a user