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: "1.4.0"
|
||||
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/
|
||||
@@ -25,7 +25,7 @@ sources:
|
||||
- https://hub.docker.com/r/guacamole/guacamole
|
||||
- http://guacamole.incubator.apache.org/doc/gug/introduction.html
|
||||
type: application
|
||||
version: 2.0.23
|
||||
version: 3.0.0
|
||||
annotations:
|
||||
truecharts.org/catagories: |
|
||||
- utilities
|
||||
|
||||
@@ -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,8 +1,8 @@
|
||||
{{/* Make sure all variables are set properly */}}
|
||||
{{ include "common.setup" . }}
|
||||
{{ include "tc.common.loader.init" . }}
|
||||
|
||||
{{/* Render configmap for vaultwarden */}}
|
||||
{{- include "guacamole-client.configmap" . }}
|
||||
|
||||
{{/* Render the templates */}}
|
||||
{{ include "common.postSetup" . }}
|
||||
{{ include "tc.common.loader.apply" . }}
|
||||
|
||||
@@ -23,6 +23,14 @@ env:
|
||||
POSTGRES_PORT: 5432
|
||||
GUACD_HOSTNAME: "localhost"
|
||||
GUACD_PORT: 4822
|
||||
POSTGRES_HOSTNAME:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: plainhost
|
||||
POSTGRES_PASSWORD:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: postgresql-password
|
||||
|
||||
envFrom:
|
||||
- configMapRef:
|
||||
@@ -130,16 +138,6 @@ postgresql:
|
||||
postgresqlUsername: guacamole
|
||||
postgresqlDatabase: guacamole
|
||||
|
||||
envValueFrom:
|
||||
POSTGRES_HOSTNAME:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: plainhost
|
||||
POSTGRES_PASSWORD:
|
||||
secretKeyRef:
|
||||
name: dbcreds
|
||||
key: postgresql-password
|
||||
|
||||
probes:
|
||||
liveness:
|
||||
path: "/guacamole"
|
||||
|
||||
Reference in New Issue
Block a user