diff --git a/incubator/patroni/Chart.yaml b/incubator/patroni/Chart.yaml index 5facdb2253d4..6dce71d65734 100644 --- a/incubator/patroni/Chart.yaml +++ b/incubator/patroni/Chart.yaml @@ -1,13 +1,13 @@ name: patroni -description: "Highly available elephant herd: HA PostgreSQL cluster." -version: 0.2.2 +description: 'Highly available elephant herd: HA PostgreSQL cluster.' +version: 0.3.2 appVersion: 1.0-p5 home: https://github.com/zalando/patroni sources: - - https://github.com/zalando/patroni - - https://github.com/zalando/spilo +- https://github.com/zalando/patroni +- https://github.com/zalando/spilo maintainers: - - name: alexeyklyukin - email: team-acid@zalando.de - - name: linki - email: team-teapot@zalando.de +- name: alexeyklyukin + email: team-acid@zalando.de +- name: linki + email: team-teapot@zalando.de diff --git a/incubator/patroni/templates/NOTES.txt b/incubator/patroni/templates/NOTES.txt index fbea38409d08..8f66086eb9ce 100644 --- a/incubator/patroni/templates/NOTES.txt +++ b/incubator/patroni/templates/NOTES.txt @@ -1,13 +1,13 @@ Patroni can be accessed via port 5432 on the following DNS name from within your cluster: -{{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local +{{ template "patroni.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local To get your password for superuser or admin run: # admin user password - PGPASSWORD_ADMIN=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.password-admin}" | base64 --decode) + PGPASSWORD_ADMIN=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "patroni.fullname" . }} -o jsonpath="{.data.password-admin}" | base64 --decode) # superuser password - PGPASSWORD_SUPERUSER=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "fullname" . }} -o jsonpath="{.data.password-superuser}" | base64 --decode) + PGPASSWORD_SUPERUSER=$(kubectl get secret --namespace {{ .Release.Namespace }} {{ template "patroni.fullname" . }} -o jsonpath="{.data.password-superuser}" | base64 --decode) To connect to your database: @@ -16,10 +16,10 @@ To connect to your database: kubectl run -i --tty --rm psql --image=postgres \ --env "PGPASSWORD=$PGPASSWORD_ADMIN" \ --command -- psql -U admin \ - -h {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local postgres + -h {{ template "patroni.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local postgres # login as superuser kubectl run -i --tty --rm psql --image=postgres \ --env "PGPASSWORD=$PGPASSWORD_SUPERUSER" \ --command -- psql -U postgres \ - -h {{ template "fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local postgres + -h {{ template "patroni.fullname" . }}.{{ .Release.Namespace }}.svc.cluster.local postgres diff --git a/incubator/patroni/templates/_helpers.tpl b/incubator/patroni/templates/_helpers.tpl index 9d99858c9135..03319951e232 100644 --- a/incubator/patroni/templates/_helpers.tpl +++ b/incubator/patroni/templates/_helpers.tpl @@ -4,6 +4,6 @@ Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec). */}} -{{- define "fullname" -}} +{{- define "patroni.fullname" -}} {{- printf "%s-%s" .Release.Name .Values.Name | trunc 63 -}} {{- end -}} diff --git a/incubator/patroni/templates/ep-patroni.yaml b/incubator/patroni/templates/ep-patroni.yaml index ca84ac34dbc6..05b1c227e09b 100644 --- a/incubator/patroni/templates/ep-patroni.yaml +++ b/incubator/patroni/templates/ep-patroni.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Endpoints metadata: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} diff --git a/incubator/patroni/templates/sec-patroni.yaml b/incubator/patroni/templates/sec-patroni.yaml index 770ed7b4aa9b..ac531ac22562 100644 --- a/incubator/patroni/templates/sec-patroni.yaml +++ b/incubator/patroni/templates/sec-patroni.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Secret metadata: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} diff --git a/incubator/patroni/templates/statefulset-patroni.yaml b/incubator/patroni/templates/statefulset-patroni.yaml index fb23e6db1be6..1ca9ecfa1365 100644 --- a/incubator/patroni/templates/statefulset-patroni.yaml +++ b/incubator/patroni/templates/statefulset-patroni.yaml @@ -1,18 +1,18 @@ apiVersion: apps/v1beta1 kind: StatefulSet metadata: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" component: "{{.Release.Name}}-{{.Values.Component}}" spec: - serviceName: {{ template "fullname" . }} + serviceName: {{ template "patroni.fullname" . }} replicas: {{default 5 .Values.Replicas }} template: metadata: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} labels: heritage: {{.Release.Service | quote }} release: {{.Release.Name | quote }} @@ -32,17 +32,17 @@ spec: - name: PGPASSWORD_SUPERUSER valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} key: password-superuser - name: PGPASSWORD_ADMIN valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} key: password-admin - name: PGPASSWORD_STANDBY valueFrom: secretKeyRef: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} key: password-standby {{if .Values.Etcd.Host }} - name: ETCD_HOST @@ -52,7 +52,7 @@ spec: value: {{default (printf "%s-etcd" .Release.Name | trunc 63) .Values.Etcd.Discovery }} {{end}} - name: SCOPE - value: {{ template "fullname" . }} + value: {{ template "patroni.fullname" . }} - name: USE_WALE value: "" - name: PGROOT @@ -79,7 +79,7 @@ spec: volumes: - name: patroni-config secret: - secretName: {{ template "fullname" . }} + secretName: {{ template "patroni.fullname" . }} volumeClaimTemplates: - metadata: diff --git a/incubator/patroni/templates/svc-patroni.yaml b/incubator/patroni/templates/svc-patroni.yaml index 9dc55793603a..0e6c0c52030b 100644 --- a/incubator/patroni/templates/svc-patroni.yaml +++ b/incubator/patroni/templates/svc-patroni.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ template "fullname" . }} + name: {{ template "patroni.fullname" . }} labels: heritage: {{ .Release.Service | quote }} release: {{ .Release.Name | quote }}