fd5884c428
"dl_path" to replace
tar xfz ${ARMADA_PKG}
cp -pr ${PKG}/charts ${PKG_BUILD_ROOT}
debrepack extracts the ${ARMADA_PKG} as ${PKG_BUILD_ROOT},
so no need cp -pr ${PKG}/charts ${PKG_BUILD_ROOT}.
And move the patches into deb_folder
Test Plan:
Pass: successfully build test
Story: 2009221
Task: 43917
Signed-off-by: Yue Tao <yue.tao@windriver.com>
Change-Id: I041bbed3dff41ed7e63c99ddfef14c206628436e
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From be3167e5342f2730ef43012d8fe4f3782c6ef468 Mon Sep 17 00:00:00 2001
|
|
From: Robert Church <robert.church@windriver.com>
|
|
Date: Wed, 12 May 2021 02:38:52 -0400
|
|
Subject: [PATCH 3/3] Update the liveness probe to verify postgres connectivity
|
|
|
|
Change the tillerLivenessProbeTemplate to test the connectivity to the
|
|
postgres backend. We will override the periodSeconds and
|
|
failureThreshold when installing the helm chart to trigger a restart of
|
|
the tiller pod over a swact when the postgres DB/server moves from one
|
|
controller to the other.
|
|
|
|
This will help guarantee that the tiller connection is always
|
|
reestablished if the connectivity to the postgres backend fails.
|
|
|
|
Signed-off-by: Robert Church <robert.church@windriver.com>
|
|
---
|
|
charts/armada/templates/deployment-api.yaml | 12 ++++++++----
|
|
1 file changed, 8 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
|
|
index bf23fb2..2b65494 100644
|
|
--- a/charts/armada/templates/deployment-api.yaml
|
|
+++ b/charts/armada/templates/deployment-api.yaml
|
|
@@ -28,10 +28,14 @@ httpGet:
|
|
{{- end }}
|
|
|
|
{{- define "tillerLivenessProbeTemplate" }}
|
|
-httpGet:
|
|
- path: /liveness
|
|
- port: {{ .Values.conf.tiller.probe_port }}
|
|
- scheme: HTTP
|
|
+exec:
|
|
+ command:
|
|
+ - nc
|
|
+ - -vz
|
|
+ - -w
|
|
+ - "1"
|
|
+ - {{ .Values.conf.tiller.sql_endpoint_ip}}
|
|
+ - "5432"
|
|
{{- end }}
|
|
|
|
{{- if .Values.manifests.deployment_api }}
|
|
--
|
|
2.16.6
|
|
|