Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update Cloudflare dashboard token as optional #1417

Merged
merged 2 commits into from
Apr 10, 2024
Merged

update Cloudflare dashboard token as optional #1417

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ddc64e
update Cloudflare dashboard token as optional
ajaykumar4 Apr 10, 2024
d708f60
Update helmrelease.yaml.j2
onedr0p Apr 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions bootstrap/templates/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions bootstrap/templates/kubernetes/apps/network/cloudflared/app/secret.sops.yaml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }#",
Expand Down
2 changes: 1 addition & 1 deletion config.sample.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading