From f87af3fba0746f3786134e9d5cfa273baee59509 Mon Sep 17 00:00:00 2001 From: Devin Buhl Date: Thu, 11 Jan 2024 15:21:47 -0500 Subject: [PATCH] fix: homepage needs raw/endraw Signed-off-by: Devin Buhl --- .../addons/grafana/app/helmrelease.yaml.j2 | 4 ++-- .../addons/homepage/app/configmap.yaml.j2 | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 index 0b0ce0d5..6f3d34b8 100644 --- a/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 +++ b/bootstrap/templates/addons/grafana/app/helmrelease.yaml.j2 @@ -167,8 +167,8 @@ spec: gethomepage.dev/group: Observability gethomepage.dev/widget.type: grafana gethomepage.dev/widget.url: http://grafana.observability - gethomepage.dev/widget.username: '{{`{{HOMEPAGE_VAR_GRAFANA_USERNAME}}`}}' - gethomepage.dev/widget.password: '{{`{{HOMEPAGE_VAR_GRAFANA_PASSWORD}}`}}' + gethomepage.dev/widget.username: '{% raw %}{{`{{ HOMEPAGE_VAR_GRAFANA_USERNAME }}`}}{% endraw %}' + gethomepage.dev/widget.password: '{% raw %}{{`{{ HOMEPAGE_VAR_GRAFANA_PASSWORD }}`}}{% endraw %}' {% endif %} hosts: - &host "grafana.${SECRET_DOMAIN}" diff --git a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 index 4b7b411c..67607302 100644 --- a/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 +++ b/bootstrap/templates/addons/homepage/app/configmap.yaml.j2 @@ -9,37 +9,37 @@ data: bookmarks.yaml: | - Communitcate: - Discord: - - icon: discord.png # https://github.com/walkxcode/dashboard-icons - href: 'https://discord.com/app' + - icon: discord.png + href: https://discord.com/app - Media: - YouTube: - icon: youtube.png - href: 'https://youtube.com/feed/subscriptions' + href: https://youtube.com/feed/subscriptions - Reading: - Reddit: - icon: reddit.png - href: 'https://reddit.com' + href: https://reddit.com - Git: - kubesearch: - icon: kubernetes-dashboard.png - href: 'https://kubesearch.dev/' + href: https://kubesearch.dev - flux-cluster-template: - icon: github.png - href: 'https://github.com/onedr0p/flux-cluster-template' + href: https://github.com/onedr0p/flux-cluster-template docker.yaml: "" kubernetes.yaml: | mode: cluster services.yaml: | - Network: - Cloudflared: - href: https://dash.cloudflare.com/ + href: https://dash.cloudflare.com icon: cloudflare-zero-trust.png description: Cloudflared Tunnel widget: type: cloudflared - accountid: {{HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID}} - tunnelid: {{HOMEPAGE_VAR_CLOUDFLARED_TUNNELID}} - key: {{HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN}} + accountid: {% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_ACCOUNTID }}{% endraw %} + tunnelid: {% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_TUNNELID }}{% endraw %} + key: {% raw %}{{ HOMEPAGE_VAR_CLOUDFLARED_API_TOKEN }}{% endraw %} settings.yaml: | title: Dashboard theme: dark