From eae45a3d9c2d568cd62d399022c2de264ebddb08 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Thu, 27 Oct 2016 15:45:42 +0200 Subject: [PATCH 1/3] fix(patroni): assume etcd to be in same namespace by default --- incubator/patroni/templates/ps-patroni.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/patroni/templates/ps-patroni.yaml b/incubator/patroni/templates/ps-patroni.yaml index 69218571a1..4c7911e729 100644 --- a/incubator/patroni/templates/ps-patroni.yaml +++ b/incubator/patroni/templates/ps-patroni.yaml @@ -44,7 +44,7 @@ spec: name: {{ template "fullname" . }} key: password-standby - name: ETCD_DISCOVERY_DOMAIN - value: {{default (printf "%s-etcd.%s.svc.cluster.local" .Release.Name .Release.Namespace) .Values.Etcd.Discovery }} + value: {{default (printf "%s-etcd" .Release.Name) .Values.Etcd.Discovery }} - name: SCOPE value: {{ template "fullname" . }} - name: USE_WALE From e112c8f0e592a9747ce479dee3b54da9d5b29222 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Thu, 27 Oct 2016 15:52:38 +0200 Subject: [PATCH 2/3] chore(patroni): bump chart version of patroni to v0.1.5 --- incubator/patroni/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/patroni/Chart.yaml b/incubator/patroni/Chart.yaml index 5f6d739157..b4557ddf23 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.1.4 +version: 0.1.5 home: https://github.com/zalando/patroni sources: - https://github.com/zalando/patroni From 989f986a2e327fb68ac62f6ae9404db339d8144a Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Thu, 27 Oct 2016 16:04:20 +0200 Subject: [PATCH 3/3] fix(patroni): truncate the service name correctly --- incubator/patroni/templates/ps-patroni.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/incubator/patroni/templates/ps-patroni.yaml b/incubator/patroni/templates/ps-patroni.yaml index 4c7911e729..bdaccbe383 100644 --- a/incubator/patroni/templates/ps-patroni.yaml +++ b/incubator/patroni/templates/ps-patroni.yaml @@ -44,7 +44,7 @@ spec: name: {{ template "fullname" . }} key: password-standby - name: ETCD_DISCOVERY_DOMAIN - value: {{default (printf "%s-etcd" .Release.Name) .Values.Etcd.Discovery }} + value: {{default (printf "%s-etcd" .Release.Name | trunc 24) .Values.Etcd.Discovery }} - name: SCOPE value: {{ template "fullname" . }} - name: USE_WALE