From a3d1eb7cd9c56c1a4b392761a205f942f1be4a61 Mon Sep 17 00:00:00 2001
From: Markus Pesch <markus.pesch@cryptic.systems>
Date: Tue, 21 Dec 2021 22:59:20 +0100
Subject: [PATCH] fix: use config.json as default and bump to v31

---
 Chart.yaml               | 2 +-
 templates/configmap.yaml | 5 +++++
 templates/cronjob.yaml   | 6 +++---
 templates/secrets.yaml   | 4 ++--
 values.yaml              | 4 +++-
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/Chart.yaml b/Chart.yaml
index dff1298..a6b813b 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -3,7 +3,7 @@ name: renovate
 description: Helm chart for renovate bot
 type: application
 version: 0.2.0
-appVersion: "29.14.0-slim"
+appVersion: "31.11.2-slim"
 icon: https://avatars3.githubusercontent.com/u/38656520?s=400&v=4
 
 keywords:
diff --git a/templates/configmap.yaml b/templates/configmap.yaml
index e026ea2..e4712a3 100644
--- a/templates/configmap.yaml
+++ b/templates/configmap.yaml
@@ -10,6 +10,11 @@ data:
   {{- $_ := set .Values "env" dict -}}
   {{- end -}}
 
+  {{- if not (hasKey .Values.renovate.env "RENOVATE_CONFIG_FILE") -}}
+  {{- $configFile := printf "/usr/src/app/config.%s" .Values.renovate.appConfig.extension -}}
+  {{- $_ := set .Values.renovate.env "RENOVATE_CONFIG_FILE" $configFile -}}
+  {{- end -}}
+
   {{/* SETUP CONFIG */}}
   {{ range $key, $value := .Values.renovate.env }}
   {{ upper $key}}: {{ quote $value }}
diff --git a/templates/cronjob.yaml b/templates/cronjob.yaml
index 97877e9..331bf47 100644
--- a/templates/cronjob.yaml
+++ b/templates/cronjob.yaml
@@ -52,10 +52,10 @@ spec:
               securityContext:
                 {{- toYaml .Values.securityContext | nindent 16 }}
               volumeMounts:
-              {{- if .Values.renovate.appConfig }}
+              {{- if .Values.renovate.appConfig.content }}
               - name: app-config
-                mountPath: /usr/src/app/config.json
-                subPath: config.json
+                mountPath: {{ printf "/usr/src/app/config.%s" .Values.renovate.appConfig.extension }}
+                subPath: config
               {{- end }}
               {{- if .Values.renovate.sshConfig.enabled }}
               - name: ssh-config
diff --git a/templates/secrets.yaml b/templates/secrets.yaml
index 03b60c4..78f26e0 100644
--- a/templates/secrets.yaml
+++ b/templates/secrets.yaml
@@ -19,7 +19,7 @@ stringData:
   {{ end }}
 {{- end }}
 
-{{- if .Values.renovate.appConfig }}
+{{- if .Values.renovate.appConfig.content }}
 ---
 apiVersion: v1
 kind: Secret
@@ -29,7 +29,7 @@ metadata:
     {{- include "renovate.labels" . | nindent 4 }}
 type: Opaque
 stringData:
-  config.json: {{ .Values.renovate.appConfig | quote }}
+  config: {{ .Values.renovate.appConfig.content | quote }}
 {{- end }}
 
 {{- if .Values.renovate.sshConfig.enabled }}
diff --git a/values.yaml b/values.yaml
index 27432d5..fea71cf 100644
--- a/values.yaml
+++ b/values.yaml
@@ -74,7 +74,9 @@ renovate:
     # GITHUB_COM_TOKEN
     # https://github.com/renovatebot/renovate/blob/main/docs/usage/getting-started/running.md#githubcom-token-for-release-notes
     # GITHUB_COM_TOKEN: ""
-  appConfig: ''
+  appConfig:
+    extension: json
+    content: '{}'
   sshConfig:
     enabled: false
     # existingSecret: