0783ec950b
Currently, we use in the playbooks [1] an armada image built upstream [2]. We use armada from upstream helm2 branch. Armada needs to be patched to add support for k8s >=1.22. Proposed an upstream patch, but we don't know how long it takes until it is merged: https://review.opendev.org/c/airship/armada/+/845392 Instead of waiting for upstream commit to merge, and an image be generated, we provide the code change here, so an armada image with k8s >=1.22 support can be generated. The k8s >=1.22 support is added by patch 0003. Necessary StarlingX build changes to support generating an container image and push to https://hub.docker.com/r/starlingx will be addressed in another commit. Note: since we always used an upstream built armada container, this package purpose was to provide helm chart overrides. We add a new purpose: to release to opensource the changes we are about to do to armada, since we'll be building a container image using these changes. To achieve this we do the following: - upversion sources from 7ef4b8643b5ec5216a8f6726841e156c0aa54a1a to ddbdd7256c20f138737f6cbd772312f7a19f58b8. This ensures we are patching the image used in the playbooks[2]. - create patches 0001 and 0002 to ensure there are no helm chart changes between upversion. This reduces testing effort related to original purpose (provide helm chart overrides) of this package. - create patch 0003 to add k8s >=1.22 support. - old patches are not changed, but renamed from 0001->0005 to 0004->0008 and regenerated. Other notes: We don't need to port this work to CentOS. This work is supposed to be temporary until the upstream airship/armada commit merges. Tests on Debian: PASS: build-pkgs -c -p armada PASS: make images Upload image to controller, use it. Using the new armada image do an apply,remove,apply,remove,apply chain for a custom StarlingX app. [1]: https://opendev.org/starlingx/ansible-playbooks/src/branch/ master/playbookconfig/src/playbooks/roles/common/ load-images-information/vars/k8s-v1.22.5/system-images.yml#L5 [2] quay.io/airshipit/armada: ddbdd7256c20f138737f6cbd772312f7a19f58b8-ubuntu_bionic Partial-Bug: 1978409 Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com> Change-Id: Id51c241a3965ef462d325da4ffce37a81693a9f4
46 lines
1.4 KiB
Diff
46 lines
1.4 KiB
Diff
From 3e34ec8c87ec5cbac79f6299e63fa1c06a75692e 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 6/8] 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.34.1
|
|
|