From b70f74fb140f5a60ab1043fbc75803561b473217 Mon Sep 17 00:00:00 2001
From: "bjw-s-bot[bot]" <87358111+bjw-s-bot[bot]@users.noreply.github.com>
Date: Tue, 10 Oct 2023 13:02:18 +0000
Subject: [PATCH] feat(k8s-ycl)!: Update common library to v2.0.3 (#190)

Co-authored-by: bjw-s-bot <87358111+bjw-s-bot[bot]@users.noreply.github.com>
Co-authored-by: Bernd Schorgers <me@bjw-s.dev>
---
 charts/apps/k8s-ycl/Chart.yaml            |  8 +--
 charts/apps/k8s-ycl/templates/common.yaml | 76 +++++++++++++----------
 charts/apps/k8s-ycl/values.yaml           | 14 ++---
 3 files changed, 53 insertions(+), 45 deletions(-)

diff --git a/charts/apps/k8s-ycl/Chart.yaml b/charts/apps/k8s-ycl/Chart.yaml
index c3370ac6..375ee6a1 100644
--- a/charts/apps/k8s-ycl/Chart.yaml
+++ b/charts/apps/k8s-ycl/Chart.yaml
@@ -2,7 +2,7 @@
 apiVersion: v2
 description: Kubernetes admission controller to remove CPU limits from Pods.
 name: k8s-ycl
-version: 0.2.1
+version: 1.0.0
 appVersion: v0.1.0
 kubeVersion: ">=1.22.0-0"
 sources:
@@ -19,12 +19,12 @@ maintainers:
 dependencies:
   - name: common
     repository: https://bjw-s.github.io/helm-charts
-    version: 1.5.1
+    version: 2.0.3
 annotations:
   artifacthub.io/changes: |-
-    - kind: fixed
+    - kind: changed
       description: |
-        Set default Deployment update strategy to RollingUpdate
+        Upgrade common library to v2
   artifacthub.io/links: |
     - name: "source"
       url: "https://github.com/bjw-s/k8s-ycl"
diff --git a/charts/apps/k8s-ycl/templates/common.yaml b/charts/apps/k8s-ycl/templates/common.yaml
index 931d9849..6000e88d 100644
--- a/charts/apps/k8s-ycl/templates/common.yaml
+++ b/charts/apps/k8s-ycl/templates/common.yaml
@@ -4,6 +4,45 @@
 
 {{/* Append the hardcoded settings */}}
 {{- define "k8s-ycl.hardcodedValues" -}}
+controllers:
+  main:
+    containers:
+      main:
+        image:
+          tag: {{ default .Chart.AppVersion .Values.controllers.main.containers.main.image.tag }}
+        probes:
+          liveness:
+            enabled: true
+            custom: true
+            spec:
+              httpGet:
+                path: /healthz
+                port: probe
+              initialDelaySeconds: 0
+              periodSeconds: 10
+              timeoutSeconds: 1
+              failureThreshold: 3
+          readiness:
+            enabled: true
+            custom: true
+            spec:
+              httpGet:
+                path: /readyz
+                port: probe
+              initialDelaySeconds: 0
+              periodSeconds: 10
+              timeoutSeconds: 1
+              failureThreshold: 3
+          startup:
+            enabled: true
+            custom: true
+            spec:
+              httpGet:
+                path: /healthz
+                port: probe
+              failureThreshold: 30
+              periodSeconds: 10
+
 service:
   main:
     enabled: true
@@ -27,43 +66,12 @@ persistence:
     enabled: true
     type: secret
     name: {{ include "k8s-ycl.servingCertificate" . }}
-    mountPath: /tls
-
-probes:
-  liveness:
-    enabled: true
-    custom: true
-    spec:
-      httpGet:
-        path: /healthz
-        port: probe
-      initialDelaySeconds: 0
-      periodSeconds: 10
-      timeoutSeconds: 1
-      failureThreshold: 3
-  readiness:
-    enabled: true
-    custom: true
-    spec:
-      httpGet:
-        path: /readyz
-        port: probe
-      initialDelaySeconds: 0
-      periodSeconds: 10
-      timeoutSeconds: 1
-      failureThreshold: 3
-  startup:
-    enabled: true
-    custom: true
-    spec:
-      httpGet:
-        path: /healthz
-        port: probe
-      failureThreshold: 30
-      periodSeconds: 10
+    globalMounts:
+      - path: /tls
 {{- end -}}
 
 {{/* Render the templates */}}
 {{- $ctx := deepCopy . -}}
 {{- $_ := include "k8s-ycl.hardcodedValues" . | fromYaml | merge $ctx.Values -}}
+
 {{- include "bjw-s.common.loader.all" $ctx }}
diff --git a/charts/apps/k8s-ycl/values.yaml b/charts/apps/k8s-ycl/values.yaml
index feb03a92..b9928ea4 100644
--- a/charts/apps/k8s-ycl/values.yaml
+++ b/charts/apps/k8s-ycl/values.yaml
@@ -1,11 +1,11 @@
 ---
-controller:
-  replicas: 1
-  strategy: RollingUpdate
-
-image:
-  repository: ghcr.io/bjw-s/k8s-ycl
-  pullPolicy: Always
+controllers:
+  main:
+    containers:
+      main:
+        image:
+          repository: ghcr.io/bjw-s/k8s-ycl
+          pullPolicy: Always
 
 webhook:
   path: /mutate--v1-pod