From 0c068f9b5aae99ce5e896fca6538b1002ec6fc04 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Thu, 21 Dec 2023 01:53:05 +0100
Subject: [PATCH] fix(forgejo-runner): update kubectl + adjust hook for cleanup
 of job

---
 forgejo-runner/Chart.yaml          | 2 +-
 forgejo-runner/templates/jobs.yaml | 4 +++-
 forgejo-runner/values.yaml         | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/forgejo-runner/Chart.yaml b/forgejo-runner/Chart.yaml
index 56d8f9b..11c423e 100644
--- a/forgejo-runner/Chart.yaml
+++ b/forgejo-runner/Chart.yaml
@@ -2,6 +2,6 @@ apiVersion: v2
 name: forgejo-runner
 description: Deploy runner for an forgejo instance (default codeberg.org)
 type: application
-version: 0.1.2
+version: 0.1.3
 
 appVersion: "3.2.0"
diff --git a/forgejo-runner/templates/jobs.yaml b/forgejo-runner/templates/jobs.yaml
index 934dc85..8e6ed69 100644
--- a/forgejo-runner/templates/jobs.yaml
+++ b/forgejo-runner/templates/jobs.yaml
@@ -62,6 +62,8 @@ metadata:
     {{- include "forgejo-runner.labels" . | nindent 4 }}
   annotations:
     config-hash: {{ toYaml .Values.runner.config | sha256sum }}
+    "helm.sh/hook": "pre-install,pre-upgrade"
+    "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 stringData:
   CONFIG_NAME: {{ .Values.runner.config.name | quote }}
   CONFIG_INSTANCE: {{ .Values.runner.config.instance | quote }}
@@ -74,7 +76,7 @@ metadata:
   labels:
     {{- include "forgejo-runner.labels" . | nindent 4 }}
   annotations:
-    "helm.sh/hook": "post-install,post-upgrade"
+    "helm.sh/hook": "pre-install,pre-upgrade"
     "helm.sh/hook-delete-policy": "before-hook-creation,hook-succeeded"
 spec:
   template:
diff --git a/forgejo-runner/values.yaml b/forgejo-runner/values.yaml
index b378b4b..05428da 100644
--- a/forgejo-runner/values.yaml
+++ b/forgejo-runner/values.yaml
@@ -36,7 +36,7 @@ kubectl:
     registry: docker.io
     repository: bitnami/kubectl
     pullPolicy: IfNotPresent
-    tag: 1.27.7
+    tag: 1.28.5
 
 serviceAccount:
   # Specifies whether a service account should be created