40dc95270b
This task aims to Upversion base OSH-I to Caracal (05f2f459)
This change upversion the base commit SHA for openstack-helm-infra
to the Caracal version. Because upstream OSH-I does not track
versions the same way Openstack does, the base commit [1] was
chosen after the caracal release date and the stability of the
changes in the upstream repo.
It also ports all StarlingX specific patches on top of it,
dropping the patches that are no longer necessary and updating
what needs to be updated in order to be applied on top of the
new base SHA.
Patch 0005 was removed because upstream OSH-I implemented the same
config. Additional configurations set on the patch was translated
into a change in the static-overrides. Patch 0018 was dropped
because the Ingress Helm chart was removed from upstream OSH-I.
Finally, the changes in the patch 0016 were also merged
on upstream OSH-I, so with the upversion they can be dropped.
Helm Releases are updated to the caracal version of each Helm
chart from OSH-I.
Test Plan:
PASS - Run downloader to get new OSH-I version
PASS - Run build-pkgs -c -a -l openstack to rebuild all packages
PASS - OSH-I is on the Caracal version
PASS - All OSH-I patches are applied
PASS - STX-O is built
With this change STX-Openstack will stop applying until the all
reviews in the relation chain are merged as well. Because of that,
the Test Plan does not include the apply and proper functioning of
the application. The last review of the relation chain will have a
more torough test plan. In order for the build not to be broken, all
reviews in the relation chain should be merged together.
Story: 2011303
Task: 51428
[1] - 05f2f45971
Change-Id: I43a11570a176f1b5aceda88c0cb3c76b2f5d228e
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
51 lines
2.5 KiB
Diff
51 lines
2.5 KiB
Diff
From 3e3f00e6f9616cbe285d649966c59a392d553ad6 Mon Sep 17 00:00:00 2001
|
|
From: jchialun <johnny.chialung@windriver.com>
|
|
Date: Fri, 20 Sep 2024 11:25:24 -0500
|
|
Subject: [PATCH] Add Kubernetes name label to helm toolkit template
|
|
|
|
This change allows the application framework status to correctly
|
|
represent the pods statuses by adding the correct label to every pod.
|
|
|
|
Signed-off-by: Johnny Chia <johnny.chialung@windriver.com>
|
|
[ Upversioned openstack-helm-infra base commit to Caracal ]
|
|
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
|
|
---
|
|
helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl | 1 +
|
|
mariadb/templates/deployment-ingress.yaml | 2 --
|
|
2 files changed, 1 insertion(+), 2 deletions(-)
|
|
|
|
diff --git a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl b/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
|
|
index 48b53fa1..37482ebc 100644
|
|
--- a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
|
|
+++ b/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
|
|
@@ -40,6 +40,7 @@ return: |
|
|
release_group: {{ $envAll.Values.release_group | default $envAll.Release.Name }}
|
|
application: {{ $application }}
|
|
component: {{ $component }}
|
|
+app.kubernetes.io/name: {{ $application }}
|
|
{{- if ($envAll.Values.pod).labels }}
|
|
{{- if hasKey $envAll.Values.pod.labels $component }}
|
|
{{ index $envAll.Values.pod "labels" $component | toYaml }}
|
|
diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml
|
|
index cf964061..91f496cb 100644
|
|
--- a/mariadb/templates/deployment-ingress.yaml
|
|
+++ b/mariadb/templates/deployment-ingress.yaml
|
|
@@ -223,7 +223,6 @@ metadata:
|
|
labels:
|
|
{{ tuple $envAll "mariadb" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
|
|
app.kubernetes.io/instance: {{ $serviceAccountName }}
|
|
- app.kubernetes.io/name: "mariadb"
|
|
app.kubernetes.io/component: "ingress"
|
|
app.kubernetes.io/managed-by: {{ $envAll.Release.Service }}
|
|
{{- if $envAll.Chart.AppVersion }}
|
|
@@ -241,7 +240,6 @@ spec:
|
|
app.starlingx.io/component: {{ ternary "application" "platform" .Values.labels.isApplication }}
|
|
{{ tuple $envAll "mariadb" "ingress" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
|
|
app.kubernetes.io/instance: {{ $serviceAccountName }}
|
|
- app.kubernetes.io/name: "mariadb"
|
|
app.kubernetes.io/component: "ingress"
|
|
app.kubernetes.io/managed-by: {{ $envAll.Release.Service }}
|
|
{{- if $envAll.Chart.AppVersion }}
|
|
--
|
|
2.34.1
|