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:
@@ -2,7 +2,7 @@ apiVersion: v2
|
||||
appVersion: "0.90.78"
|
||||
description: Status page for monitoring your websites and applications
|
||||
name: statping
|
||||
version: 5.0.25
|
||||
version: 6.0.0
|
||||
kubeVersion: ">=1.16.0-0"
|
||||
keywords:
|
||||
- statping
|
||||
@@ -15,7 +15,7 @@ sources:
|
||||
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/
|
||||
|
||||
@@ -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()))))
|
||||
@@ -74,7 +74,7 @@ questions:
|
||||
- value: "OnDelete"
|
||||
description: "(Legacy) OnDelete: ignore .spec.template changes"
|
||||
# Include{controllerExpert}
|
||||
- variable: secret
|
||||
- variable: secretEnv
|
||||
group: "Container Configuration"
|
||||
label: "Image Secrets"
|
||||
schema:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
{{/* Make sure all variables are set properly */}}
|
||||
{{- include "common.setup" . }}
|
||||
{{- include "tc.common.loader.init" . }}
|
||||
|
||||
{{/* Append the hardcoded settings */}}
|
||||
{{- define "statping.hardcodedValues" -}}
|
||||
@@ -9,4 +9,4 @@ env:
|
||||
{{- $_ := mergeOverwrite .Values (include "statping.hardcodedValues" . | fromYaml) -}}
|
||||
|
||||
{{/* Render the templates */}}
|
||||
{{ include "common.postSetup" . }}
|
||||
{{ include "tc.common.loader.apply" . }}
|
||||
|
||||
@@ -8,7 +8,7 @@ image:
|
||||
|
||||
# -- environment variables. See [application docs](https://github.com/statping/statping/wiki/Config-with-.env-File) for more details.
|
||||
# @default -- See below
|
||||
secret:
|
||||
secretEnv:
|
||||
# -- dashboard admin user (needed to edit)
|
||||
ADMIN_USER: "admin"
|
||||
# -- dashboard admin password (needed to edit)
|
||||
@@ -32,8 +32,6 @@ env:
|
||||
DB_USER: "{{ .Values.postgresql.postgresqlUsername }}"
|
||||
DB_PORT: "5432"
|
||||
POSTGRES_SSLMODE: "disable"
|
||||
|
||||
envValueFrom:
|
||||
DB_PASS:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
|
||||
Reference in New Issue
Block a user