From 2fb6b39e3e45d36d8a2bdccf85217343a8b95ba4 Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Tue, 28 May 2024 14:17:47 -0500
Subject: [PATCH] convert cloudflared to personal chart

---
 .../cl01tl/platform/matrix-synapse/Chart.yaml | 12 ++--
 .../platform/matrix-synapse/values.yaml       | 60 ++-----------------
 2 files changed, 10 insertions(+), 62 deletions(-)

diff --git a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
index e6b077b75..6f2a6f336 100644
--- a/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/Chart.yaml
@@ -28,12 +28,12 @@ dependencies:
     alias: postgres-16-cluster
     version: 3.1.0
     repository: http://alexlebens.github.io/helm-charts
-  - name: app-template
+  - name: cloudflared
     alias: cloudflared-synapse
-    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-hookshot
-    repository: https://bjw-s.github.io/helm-charts/
-    version: 3.2.1
+    repository: http://alexlebens.github.io/helm-charts
+    version: 1.0.0
 appVersion: v1.104.0
diff --git a/clusters/cl01tl/platform/matrix-synapse/values.yaml b/clusters/cl01tl/platform/matrix-synapse/values.yaml
index ad76a8379..a09d6ed58 100644
--- a/clusters/cl01tl/platform/matrix-synapse/values.yaml
+++ b/clusters/cl01tl/platform/matrix-synapse/values.yaml
@@ -186,60 +186,8 @@ postgres-16-cluster:
     backupIndex: 1
     retentionPolicy: 14d
 cloudflared-synapse:
-  global:
-    nameOverride: cloudflared-synapse
-  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: matrix-synapse-cloudflared-synapse-secret
-                  key: cf-tunnel-token
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
+  name: cloudflared-synapse
+  existingSecretName: matrix-synapse-cloudflared-synapse-secret
 cloudflared-hookshot:
-  global:
-    nameOverride: cloudflared-hookshot
-  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: matrix-synapse-cloudflared-hookshot-secret
-                  key: cf-tunnel-token
-          resources:
-            requests:
-              cpu: 100m
-              memory: 128Mi
+  name: cloudflared-hookshot
+  existingSecretName: matrix-synapse-cloudflared-hookshot-secret