From 1bcfbcaba0faf9032d9d0f7e257603dccffb45fa Mon Sep 17 00:00:00 2001
From: alexlebens <alexanderlebens@gmail.com>
Date: Thu, 30 May 2024 10:40:33 -0500
Subject: [PATCH] convert to use app-template

---
 .../applications/code-server/Chart.yaml       | 15 ++--
 .../templates/external-secret.yaml            | 29 ++++++-
 .../templates/persistent-volume-claim.yaml    |  2 +-
 .../applications/code-server/values.yaml      | 79 +++++++++++--------
 4 files changed, 85 insertions(+), 40 deletions(-)

diff --git a/clusters/cl01tl/applications/code-server/Chart.yaml b/clusters/cl01tl/applications/code-server/Chart.yaml
index 05437b8b6..0abc2c53b 100644
--- a/clusters/cl01tl/applications/code-server/Chart.yaml
+++ b/clusters/cl01tl/applications/code-server/Chart.yaml
@@ -1,12 +1,17 @@
 apiVersion: v2
 name: code-server
-version: 0.0.1
+version: 1.0.0
 sources:
   - https://github.com/coder/code-server
   - https://github.com/linuxserver/docker-code-server
-  - https://gitlab.com/alexander-chernov/helm/code-server
+  - https://github.com/bjw-s/helm-charts/tree/main/charts/other/app-template
 dependencies:
-  - name: code-server
-    version: 0.1.1
-    repository: https://charts.alekc.dev
+  - name: app-template
+    alias: code-server
+    repository: https://bjw-s.github.io/helm-charts/
+    version: 3.2.1
+  - name: cloudflared
+    alias: cloudflared
+    repository: http://alexlebens.github.io/helm-charts
+    version: 1.2.0    
 appVersion: "4.22.0"
diff --git a/clusters/cl01tl/applications/code-server/templates/external-secret.yaml b/clusters/cl01tl/applications/code-server/templates/external-secret.yaml
index a24842bc4..6b6afdac5 100644
--- a/clusters/cl01tl/applications/code-server/templates/external-secret.yaml
+++ b/clusters/cl01tl/applications/code-server/templates/external-secret.yaml
@@ -4,7 +4,7 @@ metadata:
   name: codeserver-password-secret
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: codeserver-password-secret
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: web
@@ -18,6 +18,31 @@ spec:
       remoteRef:
         conversionStrategy: Default
         decodingStrategy: None
-        key: /code-server/auth
+        key: /cl01tl/code-server/auth
         metadataPolicy: None
         property: password
+
+---
+apiVersion: external-secrets.io/v1beta1
+kind: ExternalSecret
+metadata:
+  name: codeserver-cloudflared-secret
+  namespace: {{ .Release.Namespace }}
+  labels:
+    app.kubernetes.io/name: codeserver-cloudflared-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/codeserver
+        metadataPolicy: None
+        property: token
diff --git a/clusters/cl01tl/applications/code-server/templates/persistent-volume-claim.yaml b/clusters/cl01tl/applications/code-server/templates/persistent-volume-claim.yaml
index fdd88cb10..198804928 100644
--- a/clusters/cl01tl/applications/code-server/templates/persistent-volume-claim.yaml
+++ b/clusters/cl01tl/applications/code-server/templates/persistent-volume-claim.yaml
@@ -4,7 +4,7 @@ metadata:
   name: code-server-nfs-storage
   namespace: {{ .Release.Namespace }}
   labels:
-    app.kubernetes.io/name: {{ .Release.Name }}
+    app.kubernetes.io/name: code-server-nfs-storage
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/version: {{ .Chart.AppVersion }}
     app.kubernetes.io/component: storage
diff --git a/clusters/cl01tl/applications/code-server/values.yaml b/clusters/cl01tl/applications/code-server/values.yaml
index 0e2820042..9197578f6 100644
--- a/clusters/cl01tl/applications/code-server/values.yaml
+++ b/clusters/cl01tl/applications/code-server/values.yaml
@@ -1,34 +1,49 @@
 code-server:
-  image:
-    repository: linuxserver/code-server
-    tag: 4.89.1
-  ingress:
-    enabled: true
-    className: traefik
-    annotations:
-      traefik.ingress.kubernetes.io/router.entrypoints: websecure
-      traefik.ingress.kubernetes.io/router.tls: "true"
-      cert-manager.io/cluster-issuer: letsencrypt-issuer
-    hosts:
-      - host: codeserver.alexlebens.net
-        paths:
-          - path: /
-            pathType: Prefix
-    tls:
-      - secretName: codeserver-secret-tls
-        hosts:
-          - codeserver.alexlebens.net
-  env:
-    simple:
-      TZ: US/Central
-      DEFAULT_WORKSPACE: /config
-    full:
-      - name: SUDO_PASSWORD
-        valueFrom:
-          secretKeyRef:
-            key: password
-            name: codeserver-password-secret
-            optional: false
+  controllers:
+    main:
+      type: deployment
+      replicas: 1
+      strategy: Recreate
+      revisionHistoryLimit: 3
+      containers:
+        main:
+          image:
+            repository: linuxserver/code-server
+            tag: 4.89.1
+            pullPolicy: IfNotPresent
+          env:
+            - name: TZ
+              value: US/Central
+            - name: PUID
+              value: 1000
+            - name: PGID
+              value: 1000
+            - name: DEFAULT_WORKSPACE
+              value: /config
+          envFrom:
+            - secretRef:
+                name: codeserver-password-secret
+          resources:
+            requests:
+              cpu: 100m
+              memory: 256Mi
+  serviceAccount:
+    create: true
+  service:
+    main:
+      controller: main
+      ports:
+        http:
+          port: 8443
+          targetPort: 8443
+          protocol: HTTP
   persistence:
-    existingClaim: code-server-nfs-storage
-    enabled: true
+    config:
+      existingClaim: code-server-nfs-storage
+      advancedMounts:
+        main:
+          main:
+            - path: "/video/Stand Up"
+              readOnly: false
+cloudflared:
+  existingSecretName: code-server-cloudflared-secret