update Cloudflare dashboard token as optional (#1417)

Co-authored-by: Devin Buhl <[email protected]>
onedr0p · Apr 10, 2024 · 6fd11c3 · 6fd11c3
1 parent 953ff56
commit 6fd11c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/bootstrap/templates/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
@@ -44,11 +44,13 @@ spec:
                   secretKeyRef:
                     name: cloudflared-secret
                     key: TUNNEL_ID
+              #% if bootstrap_cloudflare.tunnel.token %#
               TUNNEL_TOKEN:
                 valueFrom:
                   secretKeyRef:
                     name: cloudflared-secret
                     key: TUNNEL_TOKEN
+              #% endif %#
             args:
               - tunnel
               - --config

diff --git a/bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2
@@ -5,7 +5,9 @@ metadata:
   name: cloudflared-secret
 stringData:
   TUNNEL_ID: "#{ bootstrap_cloudflare.tunnel.id }#"
+  #% if bootstrap_cloudflare.tunnel.token %#
   TUNNEL_TOKEN: "#{ bootstrap_cloudflare.tunnel.token }#"
+  #% endif %#
   credentials.json: |
     {
       "AccountTag": "#{ bootstrap_cloudflare.tunnel.account_id }#",

diff --git a/config.sample.yaml b/config.sample.yaml
@@ -206,7 +206,7 @@ bootstrap_cloudflare:
     account_id: ""
     # (Required: CLI) Cloudflared Tunnel Secret: (cat ~/.cloudflared/*.json | jq -r .TunnelSecret)
     secret: ""
-    # (Required: Dashboard) Cloudflared Tunnel Token
+    # (Optional: Dashboard) Cloudflared Tunnel Token managed via the Cloudflare dashboard, Dashboard take higher priority over locally managed tunnel
     token: ""
     # (Required) Provide WAN access to the cluster ingresses for external ingress classes
     # The Load balancer IP for external ingress, choose an available IP