feat(apps): upgrade bootstrap and apps to app-template@v3

- cloudflared - discord-template-notifier - echo-server - homepage - system-upgrade-controller
qlonik · Apr 25, 2024 · 7722049 · 7722049
1 parent 5e91629
commit 7722049
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 53 deletions.
diff --git a/...strap/templates/kubernetes/apps/default/discord-template-notifier/app/helmrelease.yaml.j2 b/...strap/templates/kubernetes/apps/default/discord-template-notifier/app/helmrelease.yaml.j2
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       interval: 30m
       sourceRef:
         kind: HelmRepository
@@ -27,7 +27,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      discord-template-notifier:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
@@ -37,24 +37,14 @@ spec:
               tag: 0.7.0
             env:
               TZ: "${TIMEZONE}"
-            probes:
-              liveness: &disabled
-                enabled: false
-              readiness: *disabled
-              startup: *disabled
             resources:
               requests:
                 cpu: 5m
                 memory: 10M
               limits:
                 memory: 64M
-    service:
-      main: *disabled
-    ingress:
-      main: *disabled
     persistence:
       config:
-        enabled: true
         type: secret
         name: discord-template-notifier-secret
         globalMounts:

diff --git a/bootstrap/templates/kubernetes/apps/default/homepage/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/default/homepage/app/helmrelease.yaml.j2
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       interval: 30m
       sourceRef:
         kind: HelmRepository
@@ -27,7 +27,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      homepage:
         annotations:
           reloader.stakater.com/auto: "true"
         containers:
@@ -48,27 +48,26 @@ spec:
                 memory: 1G
     service:
       main:
+        controller: homepage
         ports:
           http:
             port: 3000
     ingress:
       main:
-        enabled: true
         className: internal
         hosts:
           - host: &host home.${SECRET_DOMAIN}
             paths:
               - path: /
                 pathType: Prefix
                 service:
-                  name: main
+                  identifier: main
                   port: http
         tls:
           - hosts:
               - *host
     persistence:
       config:
-        enabled: true
         type: configMap
         name: homepage-config
         globalMounts:

diff --git a/bootstrap/templates/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/cloudflared/app/helmrelease.yaml.j2
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -24,7 +24,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      cloudflared:
         replicas: 2
         strategy: RollingUpdate
         annotations:
@@ -78,6 +78,7 @@ spec:
             runAsGroup: 568
     service:
       main:
+        controller: cloudflared
         ports:
           http:
             port: *port

diff --git a/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/network/echo-server/app/helmrelease.yaml.j2
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -24,7 +24,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      echo-server:
         replicas: 2
         strategy: RollingUpdate
         containers:
@@ -61,6 +61,7 @@ spec:
             runAsGroup: 568
     service:
       main:
+        controller: echo-server
         ports:
           http:
             port: *port

diff --git a/bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/app/helmrelease.yaml.j2 b/bootstrap/templates/kubernetes/apps/tools/system-upgrade-controller/app/helmrelease.yaml.j2
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -25,7 +25,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      system-upgrade-controller:
         strategy: RollingUpdate
         containers:
           main:
@@ -47,16 +47,17 @@ spec:
                 valueFrom:
                   fieldRef:
                     fieldPath: metadata.namespace
+            securityContext:
+              allowPrivilegeEscalation: false
+              readOnlyRootFilesystem: true
+              capabilities: { drop: ["ALL"] }
+              seccompProfile:
+                type: RuntimeDefault
         pod:
           securityContext:
-            runAsNonRoot: true
             runAsUser: 65534
             runAsGroup: 65534
-            allowPrivilegeEscalation: false
-            seccompProfile:
-              type: RuntimeDefault
-            capabilities:
-              drop: ["ALL"]
+            runAsNonRoot: true
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
@@ -73,9 +74,6 @@ spec:
     serviceAccount:
       create: true
       name: system-upgrade
-    service:
-      main:
-        enabled: false
     persistence:
       tmp:
         type: emptyDir

diff --git a/kubernetes/main/apps/network/cloudflared/app/helmrelease.yaml b/kubernetes/main/apps/network/cloudflared/app/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -24,7 +24,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      cloudflared:
         replicas: 2
         strategy: RollingUpdate
         annotations:
@@ -78,6 +78,7 @@ spec:
             runAsGroup: 568
     service:
       main:
+        controller: cloudflared
         ports:
           http:
             port: *port

diff --git a/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml b/kubernetes/main/apps/network/echo-server/app/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -24,7 +24,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      echo-server:
         replicas: 2
         strategy: RollingUpdate
         containers:
@@ -61,6 +61,7 @@ spec:
             runAsGroup: 568
     service:
       main:
+        controller: echo-server
         ports:
           http:
             port: *port
@@ -79,7 +80,7 @@ spec:
             paths:
               - path: /
                 service:
-                  name: main
+                  identifier: main
                   port: http
         tls:
           - hosts:

diff --git a/kubernetes/main/apps/tools/system-upgrade-controller/app/helmrelease.yaml b/kubernetes/main/apps/tools/system-upgrade-controller/app/helmrelease.yaml
@@ -8,7 +8,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -24,7 +24,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      system-upgrade-controller:
         strategy: RollingUpdate
         containers:
           main:
@@ -46,16 +46,17 @@ spec:
                 valueFrom:
                   fieldRef:
                     fieldPath: metadata.namespace
+            securityContext:
+              allowPrivilegeEscalation: false
+              readOnlyRootFilesystem: true
+              capabilities: { drop: ["ALL"] }
+              seccompProfile:
+                type: RuntimeDefault
         pod:
           securityContext:
-            runAsNonRoot: true
             runAsUser: 65534
             runAsGroup: 65534
-            allowPrivilegeEscalation: false
-            seccompProfile:
-              type: RuntimeDefault
-            capabilities:
-              drop: ["ALL"]
+            runAsNonRoot: true
           affinity:
             nodeAffinity:
               requiredDuringSchedulingIgnoredDuringExecution:
@@ -72,9 +73,6 @@ spec:
     serviceAccount:
       create: true
       name: system-upgrade
-    service:
-      main:
-        enabled: false
     persistence:
       tmp:
         type: emptyDir

diff --git a/kubernetes/storage/apps/tools/system-upgrade-controller/app/helmrelease.yaml b/kubernetes/storage/apps/tools/system-upgrade-controller/app/helmrelease.yaml
@@ -9,7 +9,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 2.5.0
+      version: 3.0.4
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -25,7 +25,7 @@ spec:
     keepHistory: false
   values:
     controllers:
-      main:
+      system-upgrade-controller:
         strategy: RollingUpdate
         containers:
           main:
@@ -77,9 +77,6 @@ spec:
     serviceAccount:
       create: true
       name: system-upgrade
-    service:
-      main:
-        enabled: false
     persistence:
       tmp:
         type: emptyDir