From b5f02dfc2b517b4a5b26f80a09fd45bdfb02cfe9 Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Tue, 28 May 2024 14:20:38 -0500
Subject: [PATCH] add cloudflared charts

---
 .../cl01tl/applications/vikunja/Chart.yaml    | 12 ++--
 .../vikunja/templates/external-secret.yaml    | 50 +++++++++++++++
 .../cl01tl/applications/vikunja/values.yaml   | 61 ++-----------------
 3 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/clusters/cl01tl/applications/vikunja/Chart.yaml b/clusters/cl01tl/applications/vikunja/Chart.yaml
index d889f7fdc..0c52a2909 100644
--- a/clusters/cl01tl/applications/vikunja/Chart.yaml
+++ b/clusters/cl01tl/applications/vikunja/Chart.yaml
@@ -13,14 +13,14 @@ dependencies:
   - name: redis
     version: 19.5.0
     repository: https://charts.bitnami.com/bitnami
-  - name: app-template
+  - name: cloudflared
     alias: cloudflared-api
-    repository: https://bjw-s.github.io/helm-charts/
-    version: 3.2.1
-  - name: app-template
+    repository: http://alexlebens.github.io/helm-charts
+    version: 1.0.0
+  - name: cloudflared
     alias: cloudflared-front
-    repository: https://bjw-s.github.io/helm-charts/
-    version: 3.2.1
+    repository: http://alexlebens.github.io/helm-charts
+    version: 1.0.0    
   - name: postgres-cluster
     alias: postgres-16-cluster
     version: 3.1.0
diff --git a/clusters/cl01tl/applications/vikunja/templates/external-secret.yaml b/clusters/cl01tl/applications/vikunja/templates/external-secret.yaml
index 460a6c8d5..b691ba6a7 100644
--- a/clusters/cl01tl/applications/vikunja/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/vikunja/templates/external-secret.yaml
@@ -29,6 +29,56 @@ spec:
         metadataPolicy: None
         property: redis-password
 
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: vikunja-cloudflared-front-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vikunja-cloudflared-front-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: cf-tunnel-token
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cloudflare/tunnels/vikunja
+        metadataPolicy: None
+        property: token
+
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: vikunja-cloudflared-api-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: vikunja-cloudflared-api-secret
+    app.kubernetes.io/instance: {{ .Release.Name }}
+    app.kubernetes.io/version: {{ .Chart.AppVersion }}
+    app.kubernetes.io/component: web
+    app.kubernetes.io/part-of: {{ .Release.Name }}
+spec:
+  secretStoreRef:
+    kind: ClusterSecretStore
+    name: vault
+  data:
+    - secretKey: cf-tunnel-token
+      remoteRef:
+        conversionStrategy: Default
+        decodingStrategy: None
+        key: /cloudflare/tunnels/vikunja-api
+        metadataPolicy: None
+        property: token
+
 ---
 apiVersion: external-secrets.io/v1beta1
 kind: ExternalSecret
diff --git a/clusters/cl01tl/applications/vikunja/values.yaml b/clusters/cl01tl/applications/vikunja/values.yaml
index 818db7f79..173b76e15 100644
--- a/clusters/cl01tl/applications/vikunja/values.yaml
+++ b/clusters/cl01tl/applications/vikunja/values.yaml
@@ -73,63 +73,12 @@ redis:
     existingSecret: vikunja-config-secret
     existingSecretPasswordKey: redis-password
 cloudflared-api:
-  global:
-    nameOverride: cloudflared-api
-  controllers:
-    main:
-      type: deployment
-      strategy: Recreate
-      containers:
-        main:
-          image:
-            repository: cloudflare/cloudflared
-            tag: "2024.5.0"
-            pullPolicy: IfNotPresent
-          args:
-            - tunnel
-            - --no-autoupdate
-            - run
-            - --token
-            - $(CF_MANAGED_TUNNEL_TOKEN)
-          env:
-            - name: CF_MANAGED_TUNNEL_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: vikunja-api-cloudflared-secret
-                  key: cf-tunnel-token
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
+  name: cloudflared-api
+  existingSecretName: vikunja-cloudflared-api-secret
 cloudflared-front:
-  global:
-    nameOverride: cloudflared-front
-  controllers:
-    main:
-      type: deployment
-      strategy: Recreate
-      containers:
-        main:
-          image:
-            repository: cloudflare/cloudflared
-            tag: "2024.5.0"
-            pullPolicy: IfNotPresent
-          args:
-            - tunnel
-            - --no-autoupdate
-            - run
-            - --token
-            - $(CF_MANAGED_TUNNEL_TOKEN)
-          env:
-            - name: CF_MANAGED_TUNNEL_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: vikunja-front-cloudflared-secret
-                  key: cf-tunnel-token
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi              
+  name: cloudflared-front
+  existingSecretName: vikunja-cloudflared-front-secret  
+
 postgres-16-cluster:
   mode: standalone
   kubernetesClusterName: cl01tl