airship
/
armada
Code Issues Proposed changes

Merge "Add configurations for helm/tiller sql storage backend"

This commit is contained in:
Zuul 2021-03-02 23:00:50 +00:00 committed by Gerrit Code Review
parent 77c0e6a7d4 b0980f7a87
commit 240039e064
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/armada/templates/deployment-api.yaml
View File

@ -170,6 +170,10 @@ spec:
- /tiller
{{- if .Values.conf.tiller.storage }}
- --storage={{ .Values.conf.tiller.storage }}
{{- if and (eq .Values.conf.tiller.storage "sql") (.Values.conf.tiller.sql_dialect) (.Values.conf.tiller.sql_connection) }}
- --sql-dialect={{ .Values.conf.tiller.sql_dialect }}
- --sql-connection-string={{ .Values.conf.tiller.sql_connection }}
{{- end }}
{{- end }}
- -listen
- ":{{ .Values.conf.tiller.port }}"

3
charts/armada/values.yaml
View File

@ -211,6 +211,9 @@ conf:
verbosity: 5
trace: false
storage: null
# Only postgres is supported so far
sql_dialect: postgres
sql_connection: null
namespace: kube-system
# Limit the maximum number of revisions saved per release. 0 for no limit.
history_max: 0

4
charts/tiller/templates/deployment-tiller.yaml
View File

@ -98,6 +98,10 @@ spec:
- /tiller
{{- if .Values.conf.tiller.storage }}
- --storage={{ .Values.conf.tiller.storage }}
{{- if and (eq .Values.conf.tiller.storage "sql") (.Values.conf.tiller.sql_dialect) (.Values.conf.tiller.sql_connection) }}
- --sql-dialect={{ .Values.conf.tiller.sql_dialect }}
- --sql-connection-string={{ .Values.conf.tiller.sql_connection }}
{{- end }}
{{- end }}
- -listen
- ":{{ .Values.conf.tiller.port }}"

3
charts/tiller/values.yaml
View File

@ -45,6 +45,9 @@ conf:
tiller:
verbosity: 5
storage: null
# Only postgres is supported so far
sql_dialect: postgres
sql_connection: null
trace: false
# Note: Defaulting to the (default) kubernetes grace period, as anything
# greater than that will have no effect.