From 24b27631da35e5f93b8198bd9dda29c57e5761d5 Mon Sep 17 00:00:00 2001
From: Thomas Blarre <thomas@blarre.net>
Date: Fri, 27 Sep 2024 23:53:48 +0100
Subject: [PATCH] Working protonmail-bridge chart

---
 protonmail-bridge-tailscale/Chart.yaml        |  4 ++--
 protonmail-bridge-tailscale/README.txt        |  0
 .../templates/certificates-pvc.yaml           |  6 +++---
 .../templates/deployment.yaml                 | 20 +++++++++++++------
 .../templates/protonmail-bridge-pvc.yaml      |  4 ++--
 protonmail-bridge-tailscale/values.yaml       |  9 ++++-----
 6 files changed, 25 insertions(+), 18 deletions(-)
 create mode 100644 protonmail-bridge-tailscale/README.txt

diff --git a/protonmail-bridge-tailscale/Chart.yaml b/protonmail-bridge-tailscale/Chart.yaml
index 30299b0..d83bc0f 100644
--- a/protonmail-bridge-tailscale/Chart.yaml
+++ b/protonmail-bridge-tailscale/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: protonmail-bridge-tailscale
 description: A Helm chart for deploying protonmail-bridge over Tailscale
 type: application
-version: 0.1.0
-appVersion: "3.12.0-1"
+version: 0.1.5
+appVersion: "3.12.0-1-build"
diff --git a/protonmail-bridge-tailscale/README.txt b/protonmail-bridge-tailscale/README.txt
new file mode 100644
index 0000000..e69de29
diff --git a/protonmail-bridge-tailscale/templates/certificates-pvc.yaml b/protonmail-bridge-tailscale/templates/certificates-pvc.yaml
index 04cce35..30d7090 100644
--- a/protonmail-bridge-tailscale/templates/certificates-pvc.yaml
+++ b/protonmail-bridge-tailscale/templates/certificates-pvc.yaml
@@ -4,8 +4,8 @@ metadata:
   name: certificates-pvc
 spec:
   accessModes:
-    - {{ .Values.containers.cert-pvc.accessModes}}
-  storageClassName: {{ .Values.containers.cert-pvc.storageClassName }}
+    - {{ .Values.containers.certpvc.accessModes}}
+  storageClassName: {{ .Values.containers.certpvc.storageClassName }}
   resources:
     requests:
-      storage: {{ .Values.containers.cert-pvc.storageSize }}
+      storage: {{ .Values.containers.certpvc.storageSize }}
diff --git a/protonmail-bridge-tailscale/templates/deployment.yaml b/protonmail-bridge-tailscale/templates/deployment.yaml
index 1db87c7..1277385 100644
--- a/protonmail-bridge-tailscale/templates/deployment.yaml
+++ b/protonmail-bridge-tailscale/templates/deployment.yaml
@@ -4,26 +4,32 @@ metadata:
   name: protonmail-bridge-tailscale
 spec:
   replicas: 1
-  strategy:
-    type: Recreate
+  selector:
+    matchLabels:
+      app: protonmail-bridge-tailscale
   template:
     metadata:
+      labels:
+        app: protonmail-bridge-tailscale
     spec:
+      serviceAccountName: {{ .Values.serviceAccountName }}
       containers:
-        - image: shenxn/protonmail-bridge:{{ .Values.containers.protonmail-bridge.tag }}
+        - image: schklom/protonmail-bridge:latest
+        #Temp fix while the orig repo githu actions are fixed
+        #        - image: shenxn/protonmail-bridge:{{ .Chart.AppVersion }}
           name: protonmail-bridge
           volumeMounts:
             - mountPath: /root
               name: protonmail
             - mountPath: /certs
               name: certificates
-        - image: tailscale/tailscale:{{ .Values.containers.tailscale.tag }}
+        - image: tailscale/tailscale
           name: ts-protonmail-bridge
           env:
             - name: TS_HOSTNAME
               value: {{ .Values.containers.tailscale.hostname }}
             - name: TS_STATE_DIR
-              value: /var/lib/tailscale
+              value: "/var/lib/tailscale"
             - name: TS_AUTHKEY
               valueFrom:
                 secretKeyRef:
@@ -35,7 +41,9 @@ spec:
                   name: tailscale-auth
                   key: TS_EXTRA_ARGS
             - name: TS_USERSPACE
-              value: false
+              value: "false"
+            - name: TS_KUBE_SECRET
+              value: "tailscale-auth"
           securityContext:
             capabilities:
               add: ["NET_ADMIN", "SYS_MODULE"]
diff --git a/protonmail-bridge-tailscale/templates/protonmail-bridge-pvc.yaml b/protonmail-bridge-tailscale/templates/protonmail-bridge-pvc.yaml
index 43dd073..b722186 100644
--- a/protonmail-bridge-tailscale/templates/protonmail-bridge-pvc.yaml
+++ b/protonmail-bridge-tailscale/templates/protonmail-bridge-pvc.yaml
@@ -5,7 +5,7 @@ metadata:
 spec:
   accessModes:
     - ReadWriteOnce
-  storageClassName: {{ .Values.containers.protonmail-bridge.pvc.storageClassName }}
+  storageClassName: {{ .Values.containers.protonmailbridge.pvc.storageClassName }}
   resources:
     requests:
-      storage: {{ .Values.containers.protonmail-bridge.pvc.storageSize }}
+      storage: {{ .Values.containers.protonmailbridge.pvc.storageSize }}
diff --git a/protonmail-bridge-tailscale/values.yaml b/protonmail-bridge-tailscale/values.yaml
index 4ae8216..4ed977b 100644
--- a/protonmail-bridge-tailscale/values.yaml
+++ b/protonmail-bridge-tailscale/values.yaml
@@ -1,16 +1,15 @@
 containers:
-  protonmail-bridge:
-    tag: {{ .Chart.appVersion }}
+  protonmailbridge:
     pvc:
       storageClassName: longhorn
-      storageSize: 1Gi
+      storageSize: 50Gi
   tailscale:
     pvc:
       storageClassName: longhorn
       storageSize: 100Mi
     hostname: mail
-  cert-pvc:
+  certpvc:
     accessModes: ReadWriteOnce
     storageClassName: longhorn
     storageSize: 10Mi
-
+serviceAccountName: tsauth-reader