From 2680f582dc79e31a3019025a3bfe02017cd081cb Mon Sep 17 00:00:00 2001
From: Andrey Kitsul <a.kitsul@hh.ru>
Date: Fri, 28 Feb 2025 15:45:10 +0700
Subject: [PATCH] fix(forgejo-runner): Fix job image for generate-config after
 added global.image override

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

diff --git a/forgejo-runner/Chart.yaml b/forgejo-runner/Chart.yaml
index a9ef0b5..553b8f1 100644
--- a/forgejo-runner/Chart.yaml
+++ b/forgejo-runner/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: forgejo-runner
 description: Deploy runner for an forgejo instance (default codeberg.org)
 type: application
-version: "0.4.17"
+version: "0.4.18"
 # renovate: image=code.forgejo.org/forgejo/runner
 appVersion: "6.2.2"
 maintainers:
diff --git a/forgejo-runner/README.md b/forgejo-runner/README.md
index 814fc8e..7df1939 100644
--- a/forgejo-runner/README.md
+++ b/forgejo-runner/README.md
@@ -7,7 +7,7 @@ description: "Deploy runner for an forgejo instance (default codeberg.org)"
 
 # forgejo-runner
 
-![Version: 0.4.17](https://img.shields.io/badge/Version-0.4.17-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.2](https://img.shields.io/badge/AppVersion-6.2.2-informational?style=flat-square)
+![Version: 0.4.18](https://img.shields.io/badge/Version-0.4.18-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 6.2.2](https://img.shields.io/badge/AppVersion-6.2.2-informational?style=flat-square)
 
 Deploy runner for an forgejo instance (default codeberg.org)
 
diff --git a/forgejo-runner/templates/jobs.yaml b/forgejo-runner/templates/jobs.yaml
index 923d55b..6c1c88c 100644
--- a/forgejo-runner/templates/jobs.yaml
+++ b/forgejo-runner/templates/jobs.yaml
@@ -122,7 +122,10 @@ spec:
               name: data
               readOnly: true
         - name: generate-config
-          image: "{{ .Values.image.registry }}/{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
+          {{- with .Values.image }}
+          image: "{{ coalesce $.Values.global.image.registry .registry }}/{{ .repository }}:{{ .tag | default $.Chart.AppVersion }}"
+          imagePullPolicy: {{ coalesce $.Values.global.image.pullPolicy .pullPolicy }}
+          {{- end }}
           command:
             - sh 
             - -c