From 050e4abe3e8d31246d6ad39864eef870269818d3 Mon Sep 17 00:00:00 2001 From: ThomasBoni Date: Mon, 6 May 2019 19:07:40 +0200 Subject: [PATCH] [incubator/patroni] Update SCOPE value to fix patroni selector issue (#12154) * Update SCOPE value to fix patroni selector issue Signed-off-by: Thomas Boni * chart version bump Signed-off-by: Thomas Boni * use fullname everywhere Signed-off-by: Thomas Boni * update minor version instead of patch Signed-off-by: Thomas Boni --- incubator/patroni/Chart.yaml | 2 +- incubator/patroni/templates/ep-patroni.yaml | 2 +- incubator/patroni/templates/role-patroni.yaml | 2 +- incubator/patroni/templates/rolebinding-patroni.yaml | 2 +- incubator/patroni/templates/sec-patroni.yaml | 2 +- .../patroni/templates/serviceaccount-patroni.yaml | 2 +- incubator/patroni/templates/statefulset-patroni.yaml | 10 +++++----- incubator/patroni/templates/svc-patroni.yaml | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/incubator/patroni/Chart.yaml b/incubator/patroni/Chart.yaml index 263bfbf5db..df12e268a8 100644 --- a/incubator/patroni/Chart.yaml +++ b/incubator/patroni/Chart.yaml @@ -1,6 +1,6 @@ name: patroni description: 'Highly available elephant herd: HA PostgreSQL cluster.' -version: 0.11.1 +version: 0.12.0 appVersion: 1.4-p16 home: https://github.com/zalando/patroni sources: diff --git a/incubator/patroni/templates/ep-patroni.yaml b/incubator/patroni/templates/ep-patroni.yaml index 9581596c84..a218f53dad 100644 --- a/incubator/patroni/templates/ep-patroni.yaml +++ b/incubator/patroni/templates/ep-patroni.yaml @@ -3,7 +3,7 @@ kind: Endpoints metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/incubator/patroni/templates/role-patroni.yaml b/incubator/patroni/templates/role-patroni.yaml index 88d4e99d15..b18e1f29d5 100644 --- a/incubator/patroni/templates/role-patroni.yaml +++ b/incubator/patroni/templates/role-patroni.yaml @@ -4,7 +4,7 @@ kind: Role metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/incubator/patroni/templates/rolebinding-patroni.yaml b/incubator/patroni/templates/rolebinding-patroni.yaml index d0965702f9..163fa00d4c 100644 --- a/incubator/patroni/templates/rolebinding-patroni.yaml +++ b/incubator/patroni/templates/rolebinding-patroni.yaml @@ -4,7 +4,7 @@ kind: RoleBinding metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/incubator/patroni/templates/sec-patroni.yaml b/incubator/patroni/templates/sec-patroni.yaml index d62faae88f..63950ab173 100644 --- a/incubator/patroni/templates/sec-patroni.yaml +++ b/incubator/patroni/templates/sec-patroni.yaml @@ -3,7 +3,7 @@ kind: Secret metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/incubator/patroni/templates/serviceaccount-patroni.yaml b/incubator/patroni/templates/serviceaccount-patroni.yaml index eed6ab8a82..e88f6c612e 100644 --- a/incubator/patroni/templates/serviceaccount-patroni.yaml +++ b/incubator/patroni/templates/serviceaccount-patroni.yaml @@ -4,7 +4,7 @@ kind: ServiceAccount metadata: name: {{ template "patroni.serviceAccountName" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} diff --git a/incubator/patroni/templates/statefulset-patroni.yaml b/incubator/patroni/templates/statefulset-patroni.yaml index 76c129102d..3cd611db3b 100644 --- a/incubator/patroni/templates/statefulset-patroni.yaml +++ b/incubator/patroni/templates/statefulset-patroni.yaml @@ -3,7 +3,7 @@ kind: StatefulSet metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} @@ -12,13 +12,13 @@ spec: replicas: {{ .Values.replicaCount }} selector: matchLabels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} release: {{ .Release.Name }} template: metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} release: {{ .Release.Name }} spec: serviceAccountName: {{ template "patroni.serviceAccountName" . }} @@ -46,7 +46,7 @@ spec: - name: DCS_ENABLE_KUBERNETES_API value: "true" - name: KUBERNETES_LABELS - value: {{ (printf "{ \"app\": \"%s\", \"release\": \"%s\" }" (include "patroni.name" .) .Release.Name) | quote }} + value: {{ (printf "{ \"app\": \"%s\", \"release\": \"%s\" }" (include "patroni.fullname" .) .Release.Name) | quote }} - name: KUBERNETES_SCOPE_LABEL value: "app" {{- end }} @@ -167,7 +167,7 @@ spec: {{ toYaml .Values.persistentVolume.annotations | indent 8 }} {{- end }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} spec: diff --git a/incubator/patroni/templates/svc-patroni.yaml b/incubator/patroni/templates/svc-patroni.yaml index 8cf5a00fa1..27e01bb985 100644 --- a/incubator/patroni/templates/svc-patroni.yaml +++ b/incubator/patroni/templates/svc-patroni.yaml @@ -3,7 +3,7 @@ kind: Service metadata: name: {{ template "patroni.fullname" . }} labels: - app: {{ template "patroni.name" . }} + app: {{ template "patroni.fullname" . }} chart: {{ template "patroni.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }}