Merge branch 'develop' into 'develop'

fix: chart typos, update to v1.0.4-beta31

Co-authored-by: Jean Lucas <jean@4ray.co>

See merge request firefish/firefish!10611
This commit is contained in:
Kainoa Kanter 2023-09-29 17:11:11 +00:00
commit 89354d3d42
2 changed files with 5 additions and 5 deletions

View file

@ -21,7 +21,7 @@ version: 0.1.2
# incremented each time you make changes to the application. Versions are not expected to # incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using. # follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes. # It is recommended to use it with quotes.
appVersion: "rc" appVersion: 'v1.0.4-beta31'
dependencies: dependencies:
- name: elasticsearch - name: elasticsearch

View file

@ -119,7 +119,7 @@ port: 3000
db: db:
{{- if .Values.postgresql.enabled }} {{- if .Values.postgresql.enabled }}
host: {{ template "firefish.postgresql.fullname" . }} host: {{ template "firefish.postgresql.fullname" . }}
port: '5432' port: 5432
{{- else }} {{- else }}
host: {{ .Values.postgresql.postgresqlHostname }} host: {{ .Values.postgresql.postgresqlHostname }}
port: {{ .Values.postgresql.postgresqlPort | default "5432" | quote }} port: {{ .Values.postgresql.postgresqlPort | default "5432" | quote }}
@ -150,7 +150,7 @@ redis:
{{- else }} {{- else }}
host: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }} host: {{ required "When the redis chart is disabled .Values.redis.hostname is required" .Values.redis.hostname }}
{{- end }} {{- end }}
port: {{ .Values.redis.port | default "6379" | quote }} port: {{ .Values.redis.port | default 6379 }}
#family: 0 # 0=Both, 4=IPv4, 6=IPv6 #family: 0 # 0=Both, 4=IPv4, 6=IPv6
pass: {{ .Values.redis.auth.password | quote }} pass: {{ .Values.redis.auth.password | quote }}
#prefix: example-prefix #prefix: example-prefix