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
59 lines
2.2 KiB
Diff
59 lines
2.2 KiB
Diff
From 9a5b91d35923272c55e998f21ff096b5c0268ad2 Mon Sep 17 00:00:00 2001
|
|
From: Enzo Candotti <enzo.candotti@windriver.com>
|
|
Date: Wed, 6 Oct 2021 18:25:10 -0300
|
|
Subject: [PATCH 8/8] Add toleration to armada-api
|
|
|
|
Signed-off-by: Yue Tao <Yue.Tao@windriver.com>
|
|
---
|
|
charts/armada/templates/deployment-api.yaml | 4 ++++
|
|
charts/armada/templates/tests/test-armada-api.yaml | 4 ++++
|
|
charts/armada/values.yaml | 2 ++
|
|
3 files changed, 10 insertions(+)
|
|
|
|
diff --git a/charts/armada/templates/deployment-api.yaml b/charts/armada/templates/deployment-api.yaml
|
|
index 5c4825c..3ee086a 100644
|
|
--- a/charts/armada/templates/deployment-api.yaml
|
|
+++ b/charts/armada/templates/deployment-api.yaml
|
|
@@ -125,6 +125,10 @@ spec:
|
|
initContainers:
|
|
{{ tuple $envAll "api" $mounts_armada_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
|
|
{{ dict "envAll" $envAll "application" "armada" "container" "armada_api_init" | include "helm-toolkit.snippets.kubernetes_container_security_context" | indent 10 }}
|
|
+{{- with .Values.pod.tolerations.api }}
|
|
+ tolerations:
|
|
+{{ toYaml . | indent 8 }}
|
|
+{{- end }}
|
|
containers:
|
|
- name: armada-api
|
|
{{ tuple $envAll "api" | include "helm-toolkit.snippets.image" | indent 10 }}
|
|
diff --git a/charts/armada/templates/tests/test-armada-api.yaml b/charts/armada/templates/tests/test-armada-api.yaml
|
|
index 895353a..aa9e37a 100644
|
|
--- a/charts/armada/templates/tests/test-armada-api.yaml
|
|
+++ b/charts/armada/templates/tests/test-armada-api.yaml
|
|
@@ -32,6 +32,10 @@ metadata:
|
|
spec:
|
|
{{ dict "envAll" $envAll "application" "api_test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
|
|
restartPolicy: Never
|
|
+{{- with .Values.pod.tolerations.api }}
|
|
+ tolerations:
|
|
+{{ toYaml . | indent 4 }}
|
|
+{{- end }}
|
|
nodeSelector:
|
|
{{ .Values.labels.test.node_selector_key }}: {{ .Values.labels.test.node_selector_value }}
|
|
containers:
|
|
diff --git a/charts/armada/values.yaml b/charts/armada/values.yaml
|
|
index da45810..3644706 100644
|
|
--- a/charts/armada/values.yaml
|
|
+++ b/charts/armada/values.yaml
|
|
@@ -233,6 +233,8 @@ monitoring:
|
|
port: 8000
|
|
|
|
pod:
|
|
+ tolerations:
|
|
+ api: []
|
|
mandatory_access_control:
|
|
type: apparmor
|
|
armada-api:
|
|
--
|
|
2.34.1
|
|
|