refactor(charts): BREAKING CHANGE (#2836)
* Update Apps with new Common version * Patch with the secret fixes from common * fix amd
This commit is contained in:
@@ -3,7 +3,7 @@ appVersion: "5.7.9"
|
||||
dependencies:
|
||||
- name: common
|
||||
repository: https://library-charts.truecharts.org
|
||||
version: 9.3.24
|
||||
version: 10.0.8
|
||||
- condition: postgresql.enabled
|
||||
name: postgresql
|
||||
repository: https://charts.truecharts.org/
|
||||
@@ -28,7 +28,7 @@ name: fireflyiii
|
||||
sources:
|
||||
- https://github.com/firefly-iii/firefly-iii/
|
||||
type: application
|
||||
version: 14.0.30
|
||||
version: 15.0.0
|
||||
annotations:
|
||||
truecharts.org/catagories: |
|
||||
- finacial
|
||||
|
||||
@@ -0,0 +1,21 @@
|
||||
#!/usr/bin/python3
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
|
||||
|
||||
def migrate(values):
|
||||
values.update({
|
||||
**({'secretEnv': values['secret']} if values.get('secret') else {}),
|
||||
**({'secret': {}} if values.get('secret'))
|
||||
})
|
||||
return values
|
||||
|
||||
|
||||
if __name__ == '__main__':
|
||||
if len(sys.argv) != 2:
|
||||
exit(1)
|
||||
|
||||
if os.path.exists(sys.argv[1]):
|
||||
with open(sys.argv[1], 'r') as f:
|
||||
print(json.dumps(migrate(json.loads(f.read()))))
|
||||
@@ -1,6 +1,6 @@
|
||||
{{/* Define the cronjob */}}
|
||||
{{- define "fireflyiii.cronjob" -}}
|
||||
{{- $jobName := include "common.names.fullname" . }}
|
||||
{{- $jobName := include "tc.common.names.fullname" . }}
|
||||
|
||||
---
|
||||
apiVersion: batch/v1
|
||||
@@ -8,7 +8,7 @@ kind: CronJob
|
||||
metadata:
|
||||
name: {{ printf "%s-cronjob" $jobName }}
|
||||
labels:
|
||||
{{- include "common.labels" . | nindent 4 }}
|
||||
{{- include "tc.common.labels" . | nindent 4 }}
|
||||
spec:
|
||||
schedule: "{{ .Values.cronjob.schedule }}"
|
||||
concurrencyPolicy: Forbid
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{/* Make sure all variables are set properly */}}
|
||||
{{- include "common.setup" . }}
|
||||
{{- include "tc.common.loader.init" . }}
|
||||
|
||||
{{/* Render secrets for fireflyiii */}}
|
||||
{{- include "fireflyiii.secrets" . }}
|
||||
@@ -8,4 +8,4 @@
|
||||
{{- include "fireflyiii.cronjob" . }}
|
||||
|
||||
{{/* Render the templates */}}
|
||||
{{ include "common.postSetup" . }}
|
||||
{{ include "tc.common.loader.apply" . }}
|
||||
|
||||
@@ -41,8 +41,6 @@ env:
|
||||
REDIS_PORT: 6379
|
||||
APP_URL: ""
|
||||
TRUSTED_PROXIES: "172.16.0.0/16"
|
||||
|
||||
envValueFrom:
|
||||
DB_HOST:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
|
||||
Reference in New Issue
Block a user