diff --git a/kubernetes/armada/centos/armada.spec b/kubernetes/armada/centos/armada.spec index 28ab3b6e3..72d54fd7c 100644 --- a/kubernetes/armada/centos/armada.spec +++ b/kubernetes/armada/centos/armada.spec @@ -18,6 +18,7 @@ Source0: %{name}-%{git_sha}.tar.gz Patch1: 0001-Add-Helm-v2-client-initialization-using-tiller-postS.patch Patch2: 0002-Tiller-wait-for-postgres-database-ping.patch Patch3: 0003-Update-the-liveness-probe-to-verify-postgres-connect.patch +Patch4: 0004-Update-postgres-liveness-check-to-support-IPv6-addre.patch BuildArch: noarch @@ -33,6 +34,7 @@ BuildRequires: chartmuseum %patch1 -p1 %patch2 -p1 %patch3 -p1 +%patch4 -p1 %build # Package the armada chart tarball using methodology derived from: diff --git a/kubernetes/armada/centos/files/0004-Update-postgres-liveness-check-to-support-IPv6-addre.patch b/kubernetes/armada/centos/files/0004-Update-postgres-liveness-check-to-support-IPv6-addre.patch new file mode 100644 index 000000000..dbe88e809 --- /dev/null +++ b/kubernetes/armada/centos/files/0004-Update-postgres-liveness-check-to-support-IPv6-addre.patch @@ -0,0 +1,30 @@ +From e13416638b103fde04feb31027c3148c9685cf7f Mon Sep 17 00:00:00 2001 +From: Robert Church +Date: Sat, 15 May 2021 16:16:41 -0400 +Subject: [PATCH 4/4] Update postgres liveness check to support IPv6 addresses + +Templating will add square brackets for IPv6 addresses which are +interpreted as an array vs. a string. Quote this so that it interpreted +correctly. + +Signed-off-by: Robert Church +--- + charts/armada/templates/deployment-api.yaml | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml +index 2b65494..5c4825c 100644 +--- a/charts/armada/templates/deployment-api.yaml ++++ b/charts/armada/templates/deployment-api.yaml +@@ -34,7 +34,7 @@ exec: + - -vz + - -w + - "1" +- - {{ .Values.conf.tiller.sql_endpoint_ip}} ++ - "{{ .Values.conf.tiller.sql_endpoint_ip }}" + - "5432" + {{- end }} + +-- +2.16.6 +