From 06bfd7671d8dedd3b572fb4cc2bcf8e6fce033f3 Mon Sep 17 00:00:00 2001
From: auricom <27022259+auricom@users.noreply.github.com>
Date: Sat, 4 Nov 2023 17:07:05 +0100
Subject: [PATCH] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20k8s-gateway=20app-template?=
 =?UTF-8?q?=20v2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../k8s-gateway/app/helmrelease.yaml          | 76 ++++++++++---------
 1 file changed, 40 insertions(+), 36 deletions(-)

diff --git a/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml b/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml
index c8a7210f4..25a6d26a8 100644
--- a/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml
+++ b/kubernetes/apps/networking/k8s-gateway/app/helmrelease.yaml
@@ -10,7 +10,7 @@ spec:
   chart:
     spec:
       chart: app-template
-      version: 1.5.1
+      version: 2.0.3
       sourceRef:
         kind: HelmRepository
         name: bjw-s
@@ -27,15 +27,41 @@ spec:
   uninstall:
     keepHistory: false
   values:
-    controller:
-      replicas: 2
-      strategy: RollingUpdate
-      annotations:
-        reloader.stakater.com/auto: "true"
-    image:
-      repository: quay.io/oriedge/k8s_gateway
-      tag: v0.3.4
-    args: ["-conf", "/etc/coredns/Corefile"]
+    defaultPodOptions:
+      topologySpreadConstraints:
+        - maxSkew: 1
+          topologyKey: kubernetes.io/hostname
+          whenUnsatisfiable: DoNotSchedule
+          labelSelector:
+            matchLabels:
+              app.kubernetes.io/name: *app
+    controllers:
+      main:
+        replicas: 2
+        strategy: RollingUpdate
+        annotations:
+          reloader.stakater.com/auto: "true"
+        containers:
+          main:
+            image:
+              repository: quay.io/oriedge/k8s_gateway
+              tag: v0.3.4
+            args: ["-conf", "/etc/coredns/Corefile"]
+            probes:
+              readiness:
+                custom: true
+                spec:
+                  httpGet:
+                    path: /ready
+                    port: 8181
+              liveness:
+                custom: true
+                spec:
+                  httpGet:
+                    path: /health
+                    port: 8080
+              startup:
+                enabled: false
     service:
       main:
         type: LoadBalancer
@@ -61,36 +87,14 @@ spec:
             path: /metrics
             interval: 1m
             scrapeTimeout: 10s
-    probes:
-      readiness:
-        custom: true
-        spec:
-          httpGet:
-            path: /ready
-            port: 8181
-      liveness:
-        custom: true
-        spec:
-          httpGet:
-            path: /health
-            port: 8080
-      startup:
-        enabled: false
     serviceAccount:
       create: true
       name: *app
     persistence:
       config-file:
-        enabled: true
         type: configMap
         name: k8s-gateway-configmap
-        subPath: Corefile
-        mountPath: /etc/coredns/Corefile
-        readOnly: true
-    topologySpreadConstraints:
-      - maxSkew: 1
-        topologyKey: kubernetes.io/hostname
-        whenUnsatisfiable: DoNotSchedule
-        labelSelector:
-          matchLabels:
-            app.kubernetes.io/name: *app
+        globalMounts:
+          - path: /etc/coredns/Corefile
+            subPath: Corefile
+            readOnly: true