Adding back postgresURI and correcting comments

pull/467/head
Marcelo Grebois 7 years ago
parent 79510232b8
commit 3617b7a126

@ -14,8 +14,11 @@ data:
# PostgreSQL Connection string # PostgreSQL Connection string
# https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING # https://www.postgresql.org/docs/current/static/libpq-connect.html#LIBPQ-CONNSTRING
# This should be done using secrets or Vault, but for now this will also work # This should be done using secrets or Vault, but for now this will also work
{{- if .Values.config.postgresURI -}}
source: "{{ .Values.config.postgresURI }}"
{{ else }}
source: "postgres://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ template "postgresql.fullname" . }}:5432/{{ .Values.postgresql.postgresDatabase }}?sslmode=disable" source: "postgres://{{ .Values.postgresql.postgresUser }}:{{ .Values.postgresql.postgresPassword }}@{{ template "postgresql.fullname" . }}:5432/{{ .Values.postgresql.postgresDatabase }}?sslmode=disable"
{{ end }}
# Number of elements kept in the cache # Number of elements kept in the cache
# Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database. # Values unlikely to change (e.g. namespaces) are cached in order to save prevent needless roundtrips to the database.

@ -36,6 +36,7 @@ resources:
cpu: 100m cpu: 100m
memory: 128Mi memory: 128Mi
config: config:
# postgresURI: "postgres://user:password@host:5432/postgres?sslmode=disable"
paginationKey: "XxoPtCUzrUv4JV5dS+yQ+MdW7yLEJnRMwigVY/bpgtQ=" paginationKey: "XxoPtCUzrUv4JV5dS+yQ+MdW7yLEJnRMwigVY/bpgtQ="
updateInterval: 2h updateInterval: 2h
notificationWebhookEndpoint: https://example.com/notify/me notificationWebhookEndpoint: https://example.com/notify/me
@ -55,13 +56,13 @@ config:
- apk - apk
- dpkg - dpkg
- rpm - rpm
## Configuration values for the postgresql dependency. # Configuration values for the postgresql dependency.
## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md # ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
##
postgresql: postgresql:
cpu: 1000m cpu: 1000m
memory: 1Gi memory: 1Gi
## Harcording for now till https://github.com/kubernetes/helm/issues/2196 # These values are hardcoded until Helm supports secrets.
# For more info see: https://github.com/kubernetes/helm/issues/2196
postgresUser: clair postgresUser: clair
postgresPassword: clair postgresPassword: clair
postgresDatabase: clair postgresDatabase: clair

Loading…
Cancel
Save