starlingx/openstack-armada-app
Code Issues Proposed changes

Upversion base OSH-I to Caracal-05f2f459

Browse Source 
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>
This commit is contained in:
Daniel Caires 2025-01-13 09:57:21 -03:00 committed by Murillo Arantes
parent 8bde5c035e
commit 40dc95270b
39 changed files with 256 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openstack-helm-infra/debian/deb_folder/changelog
View File

@ -1,3 +1,9 @@
openstack-helm-infra (1.1-0) unstable; urgency=medium
* Upversion to Caracal release.
-- Daniel Caires <DanielMarques.Caires@windriver.com> Wed, 29 Jan 2025 08:50:31 +0000
openstack-helm-infra (1.0-1) unstable; urgency=medium openstack-helm-infra (1.0-1) unstable; urgency=medium
* Initial release. * Initial release.

4
openstack-helm-infra/debian/deb_folder/copyright
View File

@ -3,7 +3,7 @@ Upstream-Name: openstack-helm-infra
Source: https://opendev.org/starlingx/openstack-armada-app/ Source: https://opendev.org/starlingx/openstack-armada-app/
Files: * Files: *
Copyright: (c) 2013-2022 Wind River Systems, Inc Copyright: (c) 2013-2025 Wind River Systems, Inc
License: Apache-2 License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -23,7 +23,7 @@ License: Apache-2
# If you want to use GPL v2 or later for the /debian/* files use # If you want to use GPL v2 or later for the /debian/* files use
# the following clauses, or change it to suit. Delete these two lines # the following clauses, or change it to suit. Delete these two lines
Files: debian/* Files: debian/*
Copyright: 2021 Wind River Systems, Inc Copyright: 2021-2025 Wind River Systems, Inc
License: Apache-2 License: Apache-2
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.

23
openstack-helm-infra/debian/deb_folder/patches/0004-Add-io_thread_pool-for-rabbitmq.patch
View File

@ -10,10 +10,10 @@ Signed-off-by: Bin Yang <bin.yang@intel.com>
2 files changed, 12 insertions(+) 2 files changed, 12 insertions(+)
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 6b2143b4..35a482c1 100644 index 8a4c8b73..68fbac71 100644
--- a/rabbitmq/templates/statefulset.yaml --- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml
@@ -135,6 +135,10 @@ spec: @@ -146,6 +146,10 @@ spec:
key: RABBITMQ_ADMIN_PASSWORD key: RABBITMQ_ADMIN_PASSWORD
- name: RABBITMQ_DEFINITION_FILE - name: RABBITMQ_DEFINITION_FILE
value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}" value: "{{ index $envAll.Values.conf.rabbitmq "management.load_definitions" }}"
@ -24,22 +24,22 @@ index 6b2143b4..35a482c1 100644
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp
mountPath: /tmp mountPath: /tmp
@@ -233,6 +237,10 @@ spec: @@ -248,6 +252,10 @@ spec:
{{- if ne (.Values.conf.feature_flags | default "") "default" }}
- name: RABBITMQ_FEATURE_FLAGS - name: RABBITMQ_FEATURE_FLAGS
value: "{{ .Values.conf.feature_flags }}" value: "{{ .Values.conf.feature_flags }}"
+{{- end }} {{- end }}
+{{- if $envAll.Values.io_thread_pool.enabled }} +{{- if $envAll.Values.io_thread_pool.enabled }}
+ - name: RABBITMQ_IO_THREAD_POOL_SIZE + - name: RABBITMQ_IO_THREAD_POOL_SIZE
+ value: {{ $envAll.Values.io_thread_pool.size | quote }} + value: {{ $envAll.Values.io_thread_pool.size | quote }}
{{- end }} +{{- end }}
readinessProbe: {{ dict "envAll" $envAll "component" "rabbitmq" "container" "rabbitmq" "type" "readiness" "probeTemplate" (include "rabbitmqReadinessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
initialDelaySeconds: 10 {{ dict "envAll" $envAll "component" "rabbitmq" "container" "rabbitmq" "type" "liveness" "probeTemplate" (include "rabbitmqLivenessProbeTemplate" $envAll | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | trim | indent 10 }}
lifecycle:
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 2ec00310..6e6978c0 100644 index 06db8f8b..ca1f2036 100644
--- a/rabbitmq/values.yaml --- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml
@@ -409,6 +409,10 @@ volume: @@ -435,6 +435,10 @@ volume:
# Set helm3_hook to false while using helm2 # Set helm3_hook to false while using helm2
helm3_hook: true helm3_hook: true
@ -51,5 +51,4 @@ index 2ec00310..6e6978c0 100644
certificates: false certificates: false
configmap_bin: true configmap_bin: true
-- --
2.25.1 2.34.1

11
openstack-helm-infra/debian/deb_folder/patches/0006-Enable-override-of-mariadb-server-probe-parameters.patch → openstack-helm-infra/debian/deb_folder/patches/0005-Enable-override-of-mariadb-server-probe-parameters.patch
View File

@ -25,19 +25,19 @@ Change-Id: Idffb247ea722e53976238cfeacde4f70b9171393
2 files changed, 10 insertions(+), 1 deletion(-) 2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 31d322b5..1185a41c 100644 index 42521f19..350fe81c 100644
--- a/mariadb/templates/statefulset.yaml --- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml
@@ -200,6 +200,7 @@ spec: @@ -234,6 +234,7 @@ spec:
command: command:
- /tmp/stop.sh - /tmp/stop.sh
{{ dict "envAll" . "component" "server" "container" "mariadb" "type" "readiness" "probeTemplate" (include "mariadbReadinessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} {{ dict "envAll" . "component" "server" "container" "mariadb" "type" "readiness" "probeTemplate" (include "mariadbReadinessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
+{{ dict "envAll" . "component" "server" "container" "mariadb" "type" "startup" "probeTemplate" (include "mariadbReadinessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} +{{ dict "envAll" . "component" "server" "container" "mariadb" "type" "startup" "probeTemplate" (include "mariadbReadinessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
{{ dict "envAll" . "component" "server" "container" "mariadb" "type" "liveness" "probeTemplate" (include "mariadbReadinessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }} {{ dict "envAll" . "component" "server" "container" "mariadb" "type" "liveness" "probeTemplate" (include "mariadbLivenessProbe" . | fromYaml) | include "helm-toolkit.snippets.kubernetes_probe" | indent 10 }}
volumeMounts: volumeMounts:
- name: pod-tmp - name: pod-tmp
diff --git a/mariadb/values.yaml b/mariadb/values.yaml diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 741a75fe..e4a0399e 100644 index 5a6733f7..a418d4dc 100644
--- a/mariadb/values.yaml --- a/mariadb/values.yaml
+++ b/mariadb/values.yaml +++ b/mariadb/values.yaml
@@ -68,12 +68,20 @@ pod: @@ -68,12 +68,20 @@ pod:
@ -63,5 +63,4 @@ index 741a75fe..e4a0399e 100644
server: server:
pod: pod:
-- --
2.25.1 2.34.1

64
openstack-helm-infra/debian/deb_folder/patches/0005-Enable-override-of-rabbitmq-probe-parameters.patch
View File

@ -1,64 +0,0 @@
From 132df9829fa4c697e0b9701871888708973f9123 Mon Sep 17 00:00:00 2001
From: Gerry Kopec <Gerry.Kopec@windriver.com>
Date: Fri, 16 Aug 2019 14:29:46 -0400
Subject: [PATCH] Enable override of rabbitmq probe parameters
Add variables for initial delay, period and timeout for rabbitmq
liveness and readiness probes.
Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
[ fix duplicate yaml keys ]
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: I3db83ffd3c7856b099cc6fb488e3df4e8da7fb2c
---
rabbitmq/templates/statefulset.yaml | 10 ++++++----
rabbitmq/values.yaml | 8 ++++++++
2 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 35a482c1..5d013a1e 100644
--- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml
@@ -243,14 +243,16 @@ spec:
value: {{ $envAll.Values.io_thread_pool.size | quote }}
{{- end }}
readinessProbe:
- initialDelaySeconds: 10
- timeoutSeconds: 10
+ initialDelaySeconds: {{ $envAll.Values.pod.probes.readiness.initialDelaySeconds }}
+ periodSeconds: {{ $envAll.Values.pod.probes.readiness.periodSeconds }}
+ timeoutSeconds: {{ $envAll.Values.pod.probes.readiness.timeoutSeconds }}
exec:
command:
- /tmp/rabbitmq-readiness.sh
livenessProbe:
- initialDelaySeconds: 60
- timeoutSeconds: 10
+ initialDelaySeconds: {{ $envAll.Values.pod.probes.liveness.initialDelaySeconds }}
+ periodSeconds: {{ $envAll.Values.pod.probes.liveness.periodSeconds }}
+ timeoutSeconds: {{ $envAll.Values.pod.probes.liveness.timeoutSeconds }}
exec:
command:
- /tmp/rabbitmq-liveness.sh
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index 6e6978c0..e24db892 100644
--- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml
@@ -54,6 +54,14 @@ forceBoot:
pod:
probes:
+ readiness:
+ initialDelaySeconds: 10
+ periodSeconds: 10
+ timeoutSeconds: 10
+ liveness:
+ initialDelaySeconds: 30
+ periodSeconds: 10
+ timeoutSeconds: 10
prometheus_rabbitmq_exporter:
rabbitmq_exporter:
readiness:
--
2.25.1

13
openstack-helm-infra/debian/deb_folder/patches/0007-Add-mariadb-database-config-override-to-support-ipv6.patch → openstack-helm-infra/debian/deb_folder/patches/0006-Add-mariadb-database-config-override-to-support-ipv6.patch
View File

@ -31,10 +31,10 @@ index 5367f18d..961cec26 100644
{{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" ( index $envAll.Values.conf.database "99_force" ) "key" "99-force.cnf" ) | indent 2 }} {{- include "helm-toolkit.snippets.values_template_renderer" (dict "envAll" $envAll "template" ( index $envAll.Values.conf.database "99_force" ) "key" "99-force.cnf" ) | indent 2 }}
{{- end }} {{- end }}
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 1185a41c..f08094ef 100644 index 350fe81c..4198a932 100644
--- a/mariadb/templates/statefulset.yaml --- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml
@@ -229,7 +229,7 @@ spec: @@ -267,7 +267,7 @@ spec:
mountPath: /etc/mysql/conf.d/00-base.cnf mountPath: /etc/mysql/conf.d/00-base.cnf
subPath: 00-base.cnf subPath: 00-base.cnf
readOnly: true readOnly: true
@ -44,15 +44,14 @@ index 1185a41c..f08094ef 100644
mountPath: /etc/mysql/conf.d/20-override.cnf mountPath: /etc/mysql/conf.d/20-override.cnf
subPath: 20-override.cnf subPath: 20-override.cnf
diff --git a/mariadb/values.yaml b/mariadb/values.yaml diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 5f4d4f4c..6f325e9c 100644 index a418d4dc..268e73bf 100644
--- a/mariadb/values.yaml --- a/mariadb/values.yaml
+++ b/mariadb/values.yaml +++ b/mariadb/values.yaml
@@ -730,4 +730,5 @@ manifests: @@ -729,4 +729,5 @@ manifests:
service_error: true service_error: false
service: true service: true
statefulset: true statefulset: true
+ config_ipv6: false + config_ipv6: false
... ...
-- --
2.25.1 2.34.1

0
openstack-helm-infra/debian/deb_folder/patches/0008-Enable-Values.conf.database.config_override-for-mari.patch → openstack-helm-infra/debian/deb_folder/patches/0007-Enable-Values.conf.database.config_override-for-mari.patch
View File

0
openstack-helm-infra/debian/deb_folder/patches/0009-Allow-set-public-endpoint-url-for-all-openstack-types.patch → openstack-helm-infra/debian/deb_folder/patches/0008-Allow-set-public-endpoint-url-for-all-openstack-types.patch
View File

0
openstack-helm-infra/debian/deb_folder/patches/0010-Add-GaleraDB-Secure-Replica-Traffic.patch → openstack-helm-infra/debian/deb_folder/patches/0009-Add-GaleraDB-Secure-Replica-Traffic.patch
View File

48
openstack-helm-infra/debian/deb_folder/patches/0011-Fix-tls-in-openstack-helm-infra.patch → openstack-helm-infra/debian/deb_folder/patches/0010-Fix-tls-in-openstack-helm-infra.patch
View File

@ -6,19 +6,34 @@ Subject: [PATCH] Fix Support for TLS in openstack-helm-infra
Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com> Signed-off-by: Lucas Cavalcante <lucasmedeiros.cavalcante@windriver.com>
Change-Id: I382e0fc68c9a92c6a9570097db2c6a959525059d Change-Id: I382e0fc68c9a92c6a9570097db2c6a959525059d
--- ---
.../templates/manifests/_secret-tls.yaml.tpl | 97 +++++++------------ .../templates/manifests/_secret-tls.yaml.tpl | 100 ++++++------------
1 file changed, 33 insertions(+), 64 deletions(-) 1 file changed, 31 insertions(+), 69 deletions(-)
diff --git a/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl b/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl diff --git a/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl b/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl
index 24a70450..f34ac527 100644 index c8003403..ae7ee795 100644
--- a/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl --- a/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl +++ b/helm-toolkit/templates/manifests/_secret-tls.yaml.tpl
@@ -15,66 +15,36 @@ limitations under the License. @@ -15,73 +15,36 @@ limitations under the License.
{{/* {{/*
abstract: | abstract: |
Creates a manifest for a services public tls secret Creates a manifest for a services public tls secret
-examples: -examples:
- - values: | - - values: |
- annotations:
- secret:
+values: |
+ secrets:
+ tls:
+ key_manager:
+ api:
+ public: barbican-tls-public
+ endpoints:
+ key_manager:
+ host_fqdn_override:
+ public:
tls:
- key_manager_api_public:
- custom.tld/key: "value"
- secrets: - secrets:
- tls: - tls:
- key_manager: - key_manager:
@ -43,6 +58,8 @@ index 24a70450..f34ac527 100644
- kind: Secret - kind: Secret
- metadata: - metadata:
- name: barbican-tls-public - name: barbican-tls-public
- annotations:
- custom.tld/key: "value"
- type: kubernetes.io/tls - type: kubernetes.io/tls
- data: - data:
- tls.key: Rk9PLUtFWQo= - tls.key: Rk9PLUtFWQo=
@ -77,17 +94,6 @@ index 24a70450..f34ac527 100644
- data: - data:
- tls.key: Rk9PLUtFWQo= - tls.key: Rk9PLUtFWQo=
- tls.crt: Rk9PLUNSVApGT08tSU5URVJNRURJQVRFX0NSVApGT08tQ0FfQ1JUCg== - tls.crt: Rk9PLUNSVApGT08tSU5URVJNRURJQVRFX0NSVApGT08tQ0FfQ1JUCg==
+values: |
+ secrets:
+ tls:
+ key_manager:
+ api:
+ public: barbican-tls-public
+ endpoints:
+ key_manager:
+ host_fqdn_override:
+ public:
+ tls:
+ crt: | + crt: |
+ FOO-CRT + FOO-CRT
+ key: | + key: |
@ -110,8 +116,8 @@ index 24a70450..f34ac527 100644
*/}} */}}
{{- define "helm-toolkit.manifests.secret_ingress_tls" }} {{- define "helm-toolkit.manifests.secret_ingress_tls" }}
@@ -95,14 +65,13 @@ metadata: @@ -106,11 +69,10 @@ metadata:
name: {{ index $envAll.Values.secrets.tls ( $backendServiceType | replace "-" "_" ) $backendService $endpoint }} {{ tuple "tls" $customAnnotationKey $envAll | include "helm-toolkit.snippets.custom_secret_annotations" | indent 4 }}
type: kubernetes.io/tls type: kubernetes.io/tls
data: data:
+ tls.crt: {{ $endpointHost.tls.crt | b64enc }} + tls.crt: {{ $endpointHost.tls.crt | b64enc }}
@ -120,15 +126,9 @@ index 24a70450..f34ac527 100644
- tls.crt: {{ list $endpointHost.tls.crt $endpointHost.tls.ca | join "\n" | b64enc }} - tls.crt: {{ list $endpointHost.tls.crt $endpointHost.tls.ca | join "\n" | b64enc }}
-{{- else }} -{{- else }}
- tls.crt: {{ $endpointHost.tls.crt | b64enc }} - tls.crt: {{ $endpointHost.tls.crt | b64enc }}
-{{- end }}
+ ca.crt: {{ $endpointHost.tls.ca | b64enc }} + ca.crt: {{ $endpointHost.tls.ca | b64enc }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }}
{{- end }}
+{{- end }}
\ No newline at end of file
-- --
2.25.1 2.34.1

103
openstack-helm-infra/debian/deb_folder/patches/0012-Remove-mariadb-tls.patch → openstack-helm-infra/debian/deb_folder/patches/0011-Remove-mariadb-tls.patch
View File

@ -4,6 +4,8 @@ Date: Tue, 8 Feb 2022 09:18:02 -0300
Subject: Remove mariadb tls Subject: Remove mariadb tls
Change-Id: I37405da8faab3495ebe55c81389e0d769aaeb1d1 Change-Id: I37405da8faab3495ebe55c81389e0d769aaeb1d1
[ Upversioned openstack-helm-infra base commit to Caracal ]
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
--- ---
.../templates/manifests/_job-db-drop-mysql.tpl | 7 ------- .../templates/manifests/_job-db-drop-mysql.tpl | 7 -------
.../templates/manifests/_job-db-init-mysql.tpl | 7 ------- .../templates/manifests/_job-db-init-mysql.tpl | 7 -------
@ -13,7 +15,7 @@ Change-Id: I37405da8faab3495ebe55c81389e0d769aaeb1d1
5 files changed, 6 insertions(+), 36 deletions(-) 5 files changed, 6 insertions(+), 36 deletions(-)
diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
index 62ed1191..49bd12d3 100644 index 2b7ff2cd..5e31a04d 100644
--- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl --- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
@@ -37,7 +37,6 @@ limitations under the License. @@ -37,7 +37,6 @@ limitations under the License.
@ -24,12 +26,44 @@ index 62ed1191..49bd12d3 100644
{{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-drop" }} {{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-drop" }}
{{ tuple $envAll "db_drop" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "db_drop" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@@ -134,9 +133,6 @@ spec: @@ -135,9 +134,6 @@ spec:
subPath: {{ base $dbToDrop.logConfigFile | quote }} subPath: {{ base $dbToDrop.logConfigFile | quote }}
readOnly: true readOnly: true
{{- end }} {{- end }}
-{{- if $envAll.Values.manifests.certificates }} -{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }} -{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
-{{- end }}
{{- end }}
volumes:
- name: pod-tmp
@@ -152,9 +148,6 @@ spec:
name: {{ $configMapBin | quote }}
defaultMode: 0555
{{- end }}
-{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
-{{- end }}
{{- $local := dict "configMapBinFirst" true -}}
{{- range $key1, $dbToDrop := $dbsToDrop }}
{{- $dbToDropType := default "oslo" $dbToDrop.inputType }}
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index b8a1dce3..ff5d54ba 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -37,7 +37,6 @@ limitations under the License.
{{- $backoffLimit := index . "backoffLimit" | default "1000" -}}
{{- $activeDeadlineSeconds := index . "activeDeadlineSeconds" -}}
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
-{{- $dbAdminTlsSecret := index . "dbAdminTlsSecret" | default "" -}}
{{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-init" }}
{{ tuple $envAll "db_init" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@@ -134,9 +133,6 @@ spec:
subPath: {{ base $dbToInit.logConfigFile | quote }}
readOnly: true
{{- end }}
-{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
-{{- end }} -{{- end }}
{{- end }} {{- end }}
volumes: volumes:
@ -40,44 +74,12 @@ index 62ed1191..49bd12d3 100644
{{- end }} {{- end }}
-{{- if $envAll.Values.manifests.certificates }} -{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret | include "helm-toolkit.snippets.tls_volume" | indent 8 }} -{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
-{{- end }}
{{- $local := dict "configMapBinFirst" true -}}
{{- range $key1, $dbToDrop := $dbsToDrop }}
{{- $dbToDropType := default "oslo" $dbToDrop.inputType }}
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index 745e8dab..fe27e6ff 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -37,7 +37,6 @@ limitations under the License.
{{- $backoffLimit := index . "backoffLimit" | default "1000" -}}
{{- $activeDeadlineSeconds := index . "activeDeadlineSeconds" -}}
{{- $serviceNamePretty := $serviceName | replace "_" "-" -}}
-{{- $dbAdminTlsSecret := index . "dbAdminTlsSecret" | default "" -}}
{{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-init" }}
{{ tuple $envAll "db_init" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@@ -133,9 +132,6 @@ spec:
subPath: {{ base $dbToInit.logConfigFile | quote }}
readOnly: true
{{- end }}
-{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret "path" "/etc/mysql/certs" | include "helm-toolkit.snippets.tls_volume_mount" | indent 12 }}
-{{- end }}
{{- end }}
volumes:
- name: pod-tmp
@@ -150,9 +146,6 @@ spec:
name: {{ $configMapBin | quote }}
defaultMode: 0555
{{- end }}
-{{- if $envAll.Values.manifests.certificates }}
-{{- dict "enabled" $envAll.Values.manifests.certificates "name" $dbAdminTlsSecret | include "helm-toolkit.snippets.tls_volume" | indent 8 }}
-{{- end }} -{{- end }}
{{- $local := dict "configMapBinFirst" true -}} {{- $local := dict "configMapBinFirst" true -}}
{{- range $key1, $dbToInit := $dbsToInit }} {{- range $key1, $dbToInit := $dbsToInit }}
{{- $dbToInitType := default "oslo" $dbToInit.inputType }} {{- $dbToInitType := default "oslo" $dbToInit.inputType }}
diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl
index 24d2496d..6b222945 100644 index 4696c88f..364a7fe8 100644
--- a/helm-toolkit/templates/manifests/_job-db-sync.tpl --- a/helm-toolkit/templates/manifests/_job-db-sync.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl
@@ -34,7 +34,6 @@ limitations under the License. @@ -34,7 +34,6 @@ limitations under the License.
@ -88,7 +90,7 @@ index 24d2496d..6b222945 100644
{{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-sync" }} {{- $serviceAccountName := printf "%s-%s" $serviceNamePretty "db-sync" }}
{{ tuple $envAll "db_sync" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }} {{ tuple $envAll "db_sync" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
@@ -107,7 +106,6 @@ spec: @@ -108,7 +107,6 @@ spec:
mountPath: {{ $dbToSync.logConfigFile | quote }} mountPath: {{ $dbToSync.logConfigFile | quote }}
subPath: {{ base $dbToSync.logConfigFile | quote }} subPath: {{ base $dbToSync.logConfigFile | quote }}
readOnly: true readOnly: true
@ -96,7 +98,7 @@ index 24d2496d..6b222945 100644
{{- if $podVolMounts }} {{- if $podVolMounts }}
{{ $podVolMounts | toYaml | indent 12 }} {{ $podVolMounts | toYaml | indent 12 }}
{{- end }} {{- end }}
@@ -130,7 +128,6 @@ spec: @@ -131,7 +129,6 @@ spec:
secret: secret:
secretName: {{ $configMapEtc | quote }} secretName: {{ $configMapEtc | quote }}
defaultMode: 0444 defaultMode: 0444
@ -105,7 +107,7 @@ index 24d2496d..6b222945 100644
{{ $podVols | toYaml | indent 8 }} {{ $podVols | toYaml | indent 8 }}
{{- end }} {{- end }}
diff --git a/helm-toolkit/templates/scripts/_db-drop.py.tpl b/helm-toolkit/templates/scripts/_db-drop.py.tpl diff --git a/helm-toolkit/templates/scripts/_db-drop.py.tpl b/helm-toolkit/templates/scripts/_db-drop.py.tpl
index 03884fa1..81447546 100644 index 1e28da9c..86464714 100644
--- a/helm-toolkit/templates/scripts/_db-drop.py.tpl --- a/helm-toolkit/templates/scripts/_db-drop.py.tpl
+++ b/helm-toolkit/templates/scripts/_db-drop.py.tpl +++ b/helm-toolkit/templates/scripts/_db-drop.py.tpl
@@ -54,13 +54,6 @@ else: @@ -54,13 +54,6 @@ else:
@ -141,7 +143,7 @@ index 03884fa1..81447546 100644
database = user_engine.url.database database = user_engine.url.database
user = user_engine.url.username user = user_engine.url.username
diff --git a/helm-toolkit/templates/scripts/_db-init.py.tpl b/helm-toolkit/templates/scripts/_db-init.py.tpl diff --git a/helm-toolkit/templates/scripts/_db-init.py.tpl b/helm-toolkit/templates/scripts/_db-init.py.tpl
index 6027b951..321b82f1 100644 index 110cd98e..60b1c5a3 100644
--- a/helm-toolkit/templates/scripts/_db-init.py.tpl --- a/helm-toolkit/templates/scripts/_db-init.py.tpl
+++ b/helm-toolkit/templates/scripts/_db-init.py.tpl +++ b/helm-toolkit/templates/scripts/_db-init.py.tpl
@@ -54,12 +54,6 @@ else: @@ -54,12 +54,6 @@ else:
@ -175,17 +177,16 @@ index 6027b951..321b82f1 100644
# Get our user data out of the user_engine # Get our user data out of the user_engine
database = user_engine.url.database database = user_engine.url.database
user = user_engine.url.username user = user_engine.url.username
@@ -133,8 +127,8 @@ except: @@ -139,8 +133,8 @@ except:
# Create DB User
try: try:
root_engine.execute( with root_engine.connect() as connection:
- "CREATE USER IF NOT EXISTS \'{0}\'@\'%%\' IDENTIFIED BY \'{1}\' {2}".format( connection.execute(
- user, password, mysql_x509)) - "CREATE USER IF NOT EXISTS \'{0}\'@\'%%\' IDENTIFIED BY \'{1}\' {2}".format(
+ "CREATE USER IF NOT EXISTS \'{0}\'@\'%%\' IDENTIFIED BY \'{1}\'".format( - user, password, mysql_x509))
+ user, password)) + "CREATE USER IF NOT EXISTS \'{0}\'@\'%%\' IDENTIFIED BY \'{1}\'".format(
root_engine.execute( + user, password))
"GRANT ALL ON `{0}`.* TO \'{1}\'@\'%%\'".format(database, user)) connection.execute(
logger.info("Created user {0} for {1}".format(user, database)) "GRANT ALL ON `{0}`.* TO \'{1}\'@\'%%\'".format(database, user))
try:
-- --
2.25.1 2.34.1

0
openstack-helm-infra/debian/deb_folder/patches/0013-Remove-rabbitmq-tls.patch → openstack-helm-infra/debian/deb_folder/patches/0012-Remove-rabbitmq-tls.patch
View File

35
openstack-helm-infra/debian/deb_folder/patches/0014-Update-openstack-Ingress-for-networking-api-v1.patch → openstack-helm-infra/debian/deb_folder/patches/0013-Update-openstack-Ingress-for-networking-api-v1.patch
View File

@ -23,39 +23,13 @@ Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Co-authored-by: Rafael Falcao <rafael.vieirafalcao@windriver.com> Co-authored-by: Rafael Falcao <rafael.vieirafalcao@windriver.com>
[ upversioned openstack-helm-infra base commit ] [ upversioned openstack-helm-infra base commit ]
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com> Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
[ Upversioned openstack-helm-infra base commit to Caracal ]
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
Change-Id: I0bbecc097fdafdf5ebbc3a164b80ba903b5623f2 Change-Id: I0bbecc097fdafdf5ebbc3a164b80ba903b5623f2
--- ---
ingress/templates/deployment-ingress.yaml | 1 +
ingress/templates/ingress.yaml | 3 ++-
mariadb/templates/deployment-ingress.yaml | 4 ++-- mariadb/templates/deployment-ingress.yaml | 4 ++--
3 files changed, 5 insertions(+), 3 deletions(-) 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml
index 56f169d5..4153b672 100644
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@@ -68,6 +68,7 @@ rules:
- "networking.k8s.io"
resources:
- ingresses
+ - ingressclasses
verbs:
- get
- list
diff --git a/ingress/templates/ingress.yaml b/ingress/templates/ingress.yaml
index 1f67c7a7..3c39f180 100644
--- a/ingress/templates/ingress.yaml
+++ b/ingress/templates/ingress.yaml
@@ -16,7 +16,8 @@ limitations under the License.
{{- $envAll := . }}
{{- if eq .Values.deployment.mode "namespace" }}
{{- if empty (index .Values.network.ingress.annotations "kubernetes.io/ingress.class") -}}
-{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" .Values.deployment.cluster.class -}}
+{{- $ingressClassName := "nginx" -}}
+{{- $_ := set .Values.network.ingress.annotations "kubernetes.io/ingress.class" $ingressClassName -}}
{{- end -}}
{{- $serviceName := tuple "ingress" "internal" . | include "helm-toolkit.endpoints.hostname_short_endpoint_lookup" -}}
{{- $servicePort := tuple "ingress" "internal" "http" . | include "helm-toolkit.endpoints.endpoint_port_lookup" -}}
diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml
index 6fbf3389..ba0d64c9 100644 index 6fbf3389..ba0d64c9 100644
--- a/mariadb/templates/deployment-ingress.yaml --- a/mariadb/templates/deployment-ingress.yaml
@ -79,5 +53,4 @@ index 6fbf3389..ba0d64c9 100644
- configmaps - configmaps
verbs: verbs:
-- --
2.25.1 2.34.1

9
openstack-helm-infra/debian/deb_folder/patches/0015-Update-libvirt-configuration-script-for-Debian.patch → openstack-helm-infra/debian/deb_folder/patches/0014-Update-libvirt-configuration-script-for-Debian.patch
View File

@ -19,10 +19,10 @@ Change-Id: Ib2c3b0cbd0666ffd5dd310103c3f1a75b36c330c
1 file changed, 3 insertions(+), 1 deletion(-) 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl diff --git a/libvirt/templates/bin/_libvirt.sh.tpl b/libvirt/templates/bin/_libvirt.sh.tpl
index 74f7e32d..7f9177d7 100644 index 357bfe36..d16cdca3 100644
--- a/libvirt/templates/bin/_libvirt.sh.tpl --- a/libvirt/templates/bin/_libvirt.sh.tpl
+++ b/libvirt/templates/bin/_libvirt.sh.tpl +++ b/libvirt/templates/bin/_libvirt.sh.tpl
@@ -33,9 +33,11 @@ fi @@ -48,9 +48,11 @@ fi
rm -f /var/run/libvirtd.pid rm -f /var/run/libvirtd.pid
@ -34,7 +34,6 @@ index 74f7e32d..7f9177d7 100644
+ fi + fi
fi fi
#Setup Cgroups to use when breaking out of Kubernetes defined groups if [ $CGROUP_VERSION != "v2" ]; then
-- --
2.25.1 2.34.1

141
openstack-helm-infra/debian/deb_folder/patches/0017-Add-app.starlingx.io-component-label-to-pods.patch → openstack-helm-infra/debian/deb_folder/patches/0015-Add-app.starlingx.io-component-label-to-pods.patch
View File

@ -21,6 +21,8 @@ Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com> Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
[ Add labels to helm charts and change isApplication to false ] [ Add labels to helm charts and change isApplication to false ]
Signed-off-by: Giulia Melao <giulia.depaulamelao@windriver.com> Signed-off-by: Giulia Melao <giulia.depaulamelao@windriver.com>
[ Upversioned openstack-helm-infra base commit to Caracal ]
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
--- ---
ceph-rgw/templates/deployment-rgw.yaml | 2 ++ ceph-rgw/templates/deployment-rgw.yaml | 2 ++
@ -52,9 +54,6 @@ Signed-off-by: Giulia Melao <giulia.depaulamelao@windriver.com>
helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl | 5 +++++ helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl | 5 +++++
helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl | 5 +++++ helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl | 5 +++++
helm-toolkit/templates/manifests/_job_image_repo_sync.tpl | 5 +++++ helm-toolkit/templates/manifests/_job_image_repo_sync.tpl | 5 +++++
ingress/templates/deployment-error.yaml | 2 ++
ingress/templates/deployment-ingress.yaml | 2 ++
ingress/values.yaml | 1 +
libvirt/templates/daemonset-libvirt.yaml | 2 ++ libvirt/templates/daemonset-libvirt.yaml | 2 ++
libvirt/values.yaml | 1 + libvirt/values.yaml | 1 +
mariadb/templates/cron-job-backup-mariadb.yaml | 3 +++ mariadb/templates/cron-job-backup-mariadb.yaml | 3 +++
@ -73,13 +72,13 @@ Signed-off-by: Giulia Melao <giulia.depaulamelao@windriver.com>
rabbitmq/templates/pod-test.yaml | 2 ++ rabbitmq/templates/pod-test.yaml | 2 ++
rabbitmq/templates/statefulset.yaml | 2 ++ rabbitmq/templates/statefulset.yaml | 2 ++
rabbitmq/values.yaml | 1 + rabbitmq/values.yaml | 1 +
50 files changed, 123 insertions(+) 47 files changed, 118 insertions(+)
diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml diff --git a/ceph-rgw/templates/deployment-rgw.yaml b/ceph-rgw/templates/deployment-rgw.yaml
index 07da5dbb..565f0f57 100644 index 1fde8afe..a62f2757 100644
--- a/ceph-rgw/templates/deployment-rgw.yaml --- a/ceph-rgw/templates/deployment-rgw.yaml
+++ b/ceph-rgw/templates/deployment-rgw.yaml +++ b/ceph-rgw/templates/deployment-rgw.yaml
@@ -101,11 +101,13 @@ spec: @@ -123,11 +123,13 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -184,10 +183,10 @@ index 54a0f870..01c3325b 100644
{{ dict "envAll" $envAll "podName" "ceph-rgw-test" "containerNames" (list "ceph-rgw-ks-validation" "ceph-rgw-s3-validation") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }} {{ dict "envAll" $envAll "podName" "ceph-rgw-test" "containerNames" (list "ceph-rgw-ks-validation" "ceph-rgw-s3-validation") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
spec: spec:
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index d04d8fff..b312e4e9 100644 index c8ee0a22..a0befdf0 100644
--- a/ceph-rgw/values.yaml --- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml
@@ -41,6 +41,7 @@ images: @@ -42,6 +42,7 @@ images:
- image_repo_sync - image_repo_sync
labels: labels:
@ -247,7 +246,7 @@ index 316265bc..371448ee 100644
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
nodeSelector: nodeSelector:
diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml diff --git a/gnocchi/templates/deployment-api.yaml b/gnocchi/templates/deployment-api.yaml
index bb800802..41aa4a9f 100644 index 68555b18..d34f7639 100644
--- a/gnocchi/templates/deployment-api.yaml --- a/gnocchi/templates/deployment-api.yaml
+++ b/gnocchi/templates/deployment-api.yaml +++ b/gnocchi/templates/deployment-api.yaml
@@ -36,11 +36,13 @@ spec: @@ -36,11 +36,13 @@ spec:
@ -336,7 +335,7 @@ index c3cbe67b..961f8a2c 100644
spec: spec:
nodeSelector: nodeSelector:
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index 2175b133..c9b90dd2 100644 index 3cc684fc..bbfd4335 100644
--- a/gnocchi/values.yaml --- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml +++ b/gnocchi/values.yaml
@@ -16,6 +16,7 @@ @@ -16,6 +16,7 @@
@ -348,10 +347,10 @@ index 2175b133..c9b90dd2 100644
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl diff --git a/helm-toolkit/templates/manifests/_job-bootstrap.tpl b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
index 5d98c8b7..35f5fb16 100644 index 6b77004f..d061fc75 100644
--- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl --- a/helm-toolkit/templates/manifests/_job-bootstrap.tpl
+++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl +++ b/helm-toolkit/templates/manifests/_job-bootstrap.tpl
@@ -62,11 +62,15 @@ spec: @@ -63,11 +63,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -368,10 +367,10 @@ index 5d98c8b7..35f5fb16 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl diff --git a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
index 49bd12d3..27a28129 100644 index 5e31a04d..404c3d49 100644
--- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl --- a/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-drop-mysql.tpl
@@ -64,10 +64,15 @@ spec: @@ -65,10 +65,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -388,10 +387,10 @@ index 49bd12d3..27a28129 100644
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
restartPolicy: OnFailure restartPolicy: OnFailure
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
index fe27e6ff..f59069a1 100644 index ff5d54ba..84b8e1a9 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl --- a/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl +++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.tpl
@@ -62,11 +62,15 @@ spec: @@ -63,11 +63,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -408,10 +407,10 @@ index fe27e6ff..f59069a1 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl diff --git a/helm-toolkit/templates/manifests/_job-db-sync.tpl b/helm-toolkit/templates/manifests/_job-db-sync.tpl
index 6b222945..20f5e98a 100644 index 364a7fe8..c033cf39 100644
--- a/helm-toolkit/templates/manifests/_job-db-sync.tpl --- a/helm-toolkit/templates/manifests/_job-db-sync.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl +++ b/helm-toolkit/templates/manifests/_job-db-sync.tpl
@@ -59,11 +59,15 @@ spec: @@ -60,11 +60,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -428,10 +427,10 @@ index 6b222945..20f5e98a 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
index f268947b..0cbb88f0 100644 index e4b0e45d..387716c4 100644
--- a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl --- a/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.tpl
@@ -63,11 +63,15 @@ spec: @@ -64,11 +64,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -448,10 +447,10 @@ index f268947b..0cbb88f0 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-service.tpl b/helm-toolkit/templates/manifests/_job-ks-service.tpl diff --git a/helm-toolkit/templates/manifests/_job-ks-service.tpl b/helm-toolkit/templates/manifests/_job-ks-service.tpl
index a109e3cc..fb10543d 100644 index 9604c637..8111d37b 100644
--- a/helm-toolkit/templates/manifests/_job-ks-service.tpl --- a/helm-toolkit/templates/manifests/_job-ks-service.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-service.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-service.tpl
@@ -63,11 +63,15 @@ spec: @@ -64,11 +64,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -468,10 +467,10 @@ index a109e3cc..fb10543d 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
index 905eb71a..00cbb492 100644 index 58dcdc5c..f768e68e 100644
--- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl --- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
@@ -85,11 +85,15 @@ spec: @@ -86,11 +86,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -488,10 +487,10 @@ index 905eb71a..00cbb492 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName | quote }} serviceAccountName: {{ $serviceAccountName | quote }}
diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl diff --git a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
index 1501563e..8c796834 100644 index f3ff145f..4fda90de 100644
--- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl --- a/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-rabbit-init.yaml.tpl
@@ -50,11 +50,15 @@ spec: @@ -51,11 +51,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -508,10 +507,10 @@ index 1501563e..8c796834 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName | quote }} serviceAccountName: {{ $serviceAccountName | quote }}
diff --git a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl diff --git a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
index 29cb9937..3783ff89 100644 index b5fdc09c..7c4b605f 100644
--- a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl --- a/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-bucket.yaml.tpl
@@ -60,10 +60,15 @@ spec: @@ -61,10 +61,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -528,10 +527,10 @@ index 29cb9937..3783ff89 100644
serviceAccountName: {{ $serviceAccountName | quote }} serviceAccountName: {{ $serviceAccountName | quote }}
restartPolicy: OnFailure restartPolicy: OnFailure
diff --git a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl diff --git a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
index 50d9af59..4a23b945 100644 index 77d1a71e..e07549c6 100644
--- a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl --- a/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl +++ b/helm-toolkit/templates/manifests/_job-s3-user.yaml.tpl
@@ -58,10 +58,15 @@ spec: @@ -59,10 +59,15 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -567,58 +566,8 @@ index 0906df4c..bc135c64 100644
spec: spec:
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
restartPolicy: OnFailure restartPolicy: OnFailure
diff --git a/ingress/templates/deployment-error.yaml b/ingress/templates/deployment-error.yaml
index ccd6c3b3..60bbc11b 100644
--- a/ingress/templates/deployment-error.yaml
+++ b/ingress/templates/deployment-error.yaml
@@ -35,11 +35,13 @@ spec:
template:
metadata:
labels:
+ app.starlingx.io/component: {{ ternary "application" "platform" .Values.labels.isApplication }}
{{ tuple $envAll "ingress" "error-pages" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-conf.yaml" . | include "helm-toolkit.utils.hash" }}
+ configchecksum: {{ toYaml .Values.labels.isApplication | sha256sum | trunc 63 }}
{{ dict "envAll" $envAll "podName" "ingress-error-pages" "containerNames" (list "init" "ingress-error-pages") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
{{ dict "envAll" $envAll "application" "error_pages" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml
index 4153b672..dbd18833 100644
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@@ -197,6 +197,7 @@ spec:
metadata:
labels:
{{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
+ app.starlingx.io/component: {{ ternary "application" "platform" .Values.labels.isApplication }}
app: ingress-api
app.kubernetes.io/name: "ingress-api"
app.kubernetes.io/instance: {{ $serviceAccountName }}
@@ -209,6 +210,7 @@ spec:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-conf.yaml" . | include "helm-toolkit.utils.hash" }}
+ configchecksum: {{ toYaml .Values.labels.isApplication | sha256sum | trunc 63 }}
{{- $containers := "init ingress" }}
{{- if and .Values.network.host_namespace .Values.network.vip.manage }}
{{- $containers = printf "%s ingress-vip-kernel-modules ingress-vip-init ingress-vip" $containers }}
diff --git a/ingress/values.yaml b/ingress/values.yaml
index c42cdac4..c531b1cf 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -134,6 +134,7 @@ pod:
cpu: "2000m"
labels:
+ isApplication: false
server:
node_selector_key: openstack-control-plane
node_selector_value: enabled
diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml diff --git a/libvirt/templates/daemonset-libvirt.yaml b/libvirt/templates/daemonset-libvirt.yaml
index 7502fb25..ad216a6e 100644 index 4a0b128a..050aefc0 100644
--- a/libvirt/templates/daemonset-libvirt.yaml --- a/libvirt/templates/daemonset-libvirt.yaml
+++ b/libvirt/templates/daemonset-libvirt.yaml +++ b/libvirt/templates/daemonset-libvirt.yaml
@@ -58,12 +58,14 @@ spec: @@ -58,12 +58,14 @@ spec:
@ -637,7 +586,7 @@ index 7502fb25..ad216a6e 100644
{{ dict "envAll" $envAll "application" "libvirt" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "libvirt" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
diff --git a/libvirt/values.yaml b/libvirt/values.yaml diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index 3c2bad6e..9cd24011 100644 index ba35a3f5..22ff231c 100644
--- a/libvirt/values.yaml --- a/libvirt/values.yaml
+++ b/libvirt/values.yaml +++ b/libvirt/values.yaml
@@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
@ -649,7 +598,7 @@ index 3c2bad6e..9cd24011 100644
libvirt: libvirt:
node_selector_key: openstack-compute-node node_selector_key: openstack-compute-node
diff --git a/mariadb/templates/cron-job-backup-mariadb.yaml b/mariadb/templates/cron-job-backup-mariadb.yaml diff --git a/mariadb/templates/cron-job-backup-mariadb.yaml b/mariadb/templates/cron-job-backup-mariadb.yaml
index db8c0663..52d7269d 100644 index cb838125..9222a086 100644
--- a/mariadb/templates/cron-job-backup-mariadb.yaml --- a/mariadb/templates/cron-job-backup-mariadb.yaml
+++ b/mariadb/templates/cron-job-backup-mariadb.yaml +++ b/mariadb/templates/cron-job-backup-mariadb.yaml
@@ -47,7 +47,10 @@ spec: @@ -47,7 +47,10 @@ spec:
@ -714,10 +663,10 @@ index c8b3c29c..2f4ef851 100644
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" }}
{{ dict "envAll" $envAll "podName" "mariadb-test" "containerNames" (list "init" "mariadb-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }} {{ dict "envAll" $envAll "podName" "mariadb-test" "containerNames" (list "init" "mariadb-test") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 4 }}
diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml diff --git a/mariadb/templates/statefulset.yaml b/mariadb/templates/statefulset.yaml
index 1a5125e5..43953c62 100644 index 5be9ab46..b8d3f193 100644
--- a/mariadb/templates/statefulset.yaml --- a/mariadb/templates/statefulset.yaml
+++ b/mariadb/templates/statefulset.yaml +++ b/mariadb/templates/statefulset.yaml
@@ -97,8 +97,10 @@ spec: @@ -125,8 +125,10 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -729,7 +678,7 @@ index 1a5125e5..43953c62 100644
configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }} configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
diff --git a/mariadb/values.yaml b/mariadb/values.yaml diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index 17665c4e..d58fff83 100644 index 53789ba1..61d2d3e7 100644
--- a/mariadb/values.yaml --- a/mariadb/values.yaml
+++ b/mariadb/values.yaml +++ b/mariadb/values.yaml
@@ -39,6 +39,7 @@ images: @@ -39,6 +39,7 @@ images:
@ -758,7 +707,7 @@ index b3d12eaf..a2f0d912 100644
spec: spec:
{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
diff --git a/memcached/values.yaml b/memcached/values.yaml diff --git a/memcached/values.yaml b/memcached/values.yaml
index 64af4c05..8694f3b7 100644 index c1a4cd0c..dd2bf3c6 100644
--- a/memcached/values.yaml --- a/memcached/values.yaml
+++ b/memcached/values.yaml +++ b/memcached/values.yaml
@@ -130,6 +130,7 @@ images: @@ -130,6 +130,7 @@ images:
@ -770,7 +719,7 @@ index 64af4c05..8694f3b7 100644
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml diff --git a/mongodb/templates/statefulset.yaml b/mongodb/templates/statefulset.yaml
index e5e0b48d..763da1b1 100644 index 7456a077..6c4c5148 100644
--- a/mongodb/templates/statefulset.yaml --- a/mongodb/templates/statefulset.yaml
+++ b/mongodb/templates/statefulset.yaml +++ b/mongodb/templates/statefulset.yaml
@@ -35,10 +35,12 @@ spec: @@ -35,10 +35,12 @@ spec:
@ -787,7 +736,7 @@ index e5e0b48d..763da1b1 100644
serviceAccountName: {{ $serviceAccountName }} serviceAccountName: {{ $serviceAccountName }}
affinity: affinity:
diff --git a/mongodb/values.yaml b/mongodb/values.yaml diff --git a/mongodb/values.yaml b/mongodb/values.yaml
index 90167a0d..3f782371 100644 index e0d353e5..00afdcfe 100644
--- a/mongodb/values.yaml --- a/mongodb/values.yaml
+++ b/mongodb/values.yaml +++ b/mongodb/values.yaml
@@ -70,6 +70,7 @@ volume: @@ -70,6 +70,7 @@ volume:
@ -799,7 +748,7 @@ index 90167a0d..3f782371 100644
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
diff --git a/openvswitch/templates/daemonset.yaml b/openvswitch/templates/daemonset.yaml diff --git a/openvswitch/templates/daemonset.yaml b/openvswitch/templates/daemonset.yaml
index 79840238..a1cee2b1 100644 index 3a66fa51..c7aa9a05 100644
--- a/openvswitch/templates/daemonset.yaml --- a/openvswitch/templates/daemonset.yaml
+++ b/openvswitch/templates/daemonset.yaml +++ b/openvswitch/templates/daemonset.yaml
@@ -76,9 +76,11 @@ spec: @@ -76,9 +76,11 @@ spec:
@ -815,7 +764,7 @@ index 79840238..a1cee2b1 100644
{{ dict "envAll" $envAll "podName" "openvswitch" "containerNames" (list "openvswitch-db" "openvswitch-db-perms" "openvswitch-vswitchd" "openvswitch-vswitchd-modules" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }} {{ dict "envAll" $envAll "podName" "openvswitch" "containerNames" (list "openvswitch-db" "openvswitch-db-perms" "openvswitch-vswitchd" "openvswitch-vswitchd-modules" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec: spec:
diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index 4c6971c2..c69b59ac 100644 index b350f03e..49006ea9 100644
--- a/openvswitch/values.yaml --- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml +++ b/openvswitch/values.yaml
@@ -32,6 +32,7 @@ images: @@ -32,6 +32,7 @@ images:
@ -862,10 +811,10 @@ index 37d8af36..2cdc047d 100644
spec: spec:
{{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }} {{ dict "envAll" $envAll "application" "test" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 2 }}
diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml diff --git a/rabbitmq/templates/statefulset.yaml b/rabbitmq/templates/statefulset.yaml
index 5d013a1e..b669f25c 100644 index 68fbac71..0bbe2a8c 100644
--- a/rabbitmq/templates/statefulset.yaml --- a/rabbitmq/templates/statefulset.yaml
+++ b/rabbitmq/templates/statefulset.yaml +++ b/rabbitmq/templates/statefulset.yaml
@@ -96,6 +96,7 @@ spec: @@ -107,6 +107,7 @@ spec:
template: template:
metadata: metadata:
labels: labels:
@ -873,7 +822,7 @@ index 5d013a1e..b669f25c 100644
{{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }} {{ tuple $envAll "rabbitmq" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
annotations: annotations:
{{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }} {{ tuple $envAll | include "helm-toolkit.snippets.release_uuid" | indent 8 }}
@@ -103,6 +104,7 @@ spec: @@ -114,6 +115,7 @@ spec:
configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }} configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
secret-rabbit-admin-hash: {{ tuple "secret-rabbit-admin.yaml" . | include "helm-toolkit.utils.hash" }} secret-rabbit-admin-hash: {{ tuple "secret-rabbit-admin.yaml" . | include "helm-toolkit.utils.hash" }}
secret-erlang-cookie-hash: {{ tuple "secret-erlang-cookie.yaml" . | include "helm-toolkit.utils.hash" }} secret-erlang-cookie-hash: {{ tuple "secret-erlang-cookie.yaml" . | include "helm-toolkit.utils.hash" }}
@ -882,7 +831,7 @@ index 5d013a1e..b669f25c 100644
spec: spec:
{{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }} {{ dict "envAll" $envAll "application" "server" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index e24db892..aa9b52ff 100644 index ca1f2036..68a963a1 100644
--- a/rabbitmq/values.yaml --- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml
@@ -17,6 +17,7 @@ @@ -17,6 +17,7 @@
@ -894,4 +843,4 @@ index e24db892..aa9b52ff 100644
node_selector_key: openstack-control-plane node_selector_key: openstack-control-plane
node_selector_value: enabled node_selector_value: enabled
-- --
2.46.0 2.34.1

49
openstack-helm-infra/debian/deb_folder/patches/0016-Add-ServiceAccount-to-openvswitch-pod.patch
View File

@ -1,49 +0,0 @@
From 1a16da4ed0913c2de36b070326277a3aa555e376 Mon Sep 17 00:00:00 2001
From: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Date: Thu, 13 Jul 2023 16:35:40 -0300
Subject: [PATCH] Add ServiceAccount to openvswitch pod
This change includes back the the helm-toolkit snippet:
kubernetes_pod_rbac_serviceaccount to the openvswitch Daemonset
definition, since it is responsible for creating the POD's
ServiceAccount which contains imagePullSecrets that enable the POD to
retrieve images from private registries.
Originally openvswitch chart had two daemonset definitions: for the
db and for the server, but recently both were merged into a single
daemonset [1] and the template inclusion was dropped during this merge
[1] https://github.com/openstack/openstack-helm-infra/
commit/73e2b3322d3cc8ca4ee8453dd612266589d734b1
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: I59ef955529a34020d4bba0da0b48d1f47e2e1039
---
openvswitch/templates/daemonset.yaml | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/openvswitch/templates/daemonset.yaml b/openvswitch/templates/daemonset.yaml
index 244ffb8e..79840238 100644
--- a/openvswitch/templates/daemonset.yaml
+++ b/openvswitch/templates/daemonset.yaml
@@ -56,6 +56,9 @@ exec:
{{- if .Values.manifests.daemonset }}
{{- $envAll := . }}
+
+{{- $serviceAccountName := "openvswitch-server" }}
+{{ tuple $envAll "vswitchd" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
---
apiVersion: apps/v1
kind: DaemonSet
@@ -80,6 +83,7 @@ spec:
{{ dict "envAll" $envAll "podName" "openvswitch" "containerNames" (list "openvswitch-db" "openvswitch-db-perms" "openvswitch-vswitchd" "openvswitch-vswitchd-modules" "init") | include "helm-toolkit.snippets.kubernetes_mandatory_access_control_annotation" | indent 8 }}
spec:
shareProcessNamespace: true
+ serviceAccountName: {{ $serviceAccountName }}
{{ dict "envAll" $envAll "application" "ovs" | include "helm-toolkit.snippets.kubernetes_pod_security_context" | indent 6 }}
nodeSelector:
{{ .Values.labels.ovs.node_selector_key }}: {{ .Values.labels.ovs.node_selector_value }}
--
2.25.1

112
openstack-helm-infra/debian/deb_folder/patches/0019-Add-pre-apply-cleanup-Job-to-STX-O-Helm-charts.patch → openstack-helm-infra/debian/deb_folder/patches/0016-Add-pre-apply-cleanup-Job-to-STX-O-Helm-charts.patch
View File

@ -17,14 +17,15 @@ This patch creates a Job template that runs right before the Helm
chart is installed ou updated. This Job deletes all jobs that have chart is installed ou updated. This Job deletes all jobs that have
its status as completed. its status as completed.
[ Upversioned openstack-helm-infra base commit to Caracal ]
Signed-off-by: Daniel Caires <DanielMarques.Caires@windriver.com>
--- ---
ceph-rgw/templates/job-pre-apply-cleanup.yaml | 18 ++++ ceph-rgw/templates/job-pre-apply-cleanup.yaml | 18 ++++
ceph-rgw/values.yaml | 2 + ceph-rgw/values.yaml | 2 +
gnocchi/templates/job-pre-apply-cleanup.yaml | 18 ++++ gnocchi/templates/job-pre-apply-cleanup.yaml | 18 ++++
gnocchi/values.yaml | 2 + gnocchi/values.yaml | 2 +
.../manifests/_job-pre-apply-cleanup.tpl | 93 +++++++++++++++++++ .../manifests/_job-pre-apply-cleanup.tpl | 93 +++++++++++++++++++
ingress/templates/job-pre-apply-cleanup.yaml | 18 ++++
ingress/values.yaml | 2 +
libvirt/templates/job-pre-apply-cleanup.yaml | 18 ++++ libvirt/templates/job-pre-apply-cleanup.yaml | 18 ++++
libvirt/values.yaml | 2 + libvirt/values.yaml | 2 +
mariadb/templates/job-pre-apply-cleanup.yaml | 18 ++++ mariadb/templates/job-pre-apply-cleanup.yaml | 18 ++++
@ -35,11 +36,10 @@ its status as completed.
openvswitch/values.yaml | 2 + openvswitch/values.yaml | 2 +
rabbitmq/templates/job-pre-apply-cleanup.yaml | 18 ++++ rabbitmq/templates/job-pre-apply-cleanup.yaml | 18 ++++
rabbitmq/values.yaml | 2 + rabbitmq/values.yaml | 2 +
17 files changed, 253 insertions(+) 15 files changed, 233 insertions(+)
create mode 100644 ceph-rgw/templates/job-pre-apply-cleanup.yaml create mode 100644 ceph-rgw/templates/job-pre-apply-cleanup.yaml
create mode 100644 gnocchi/templates/job-pre-apply-cleanup.yaml create mode 100644 gnocchi/templates/job-pre-apply-cleanup.yaml
create mode 100644 helm-toolkit/templates/manifests/_job-pre-apply-cleanup.tpl create mode 100644 helm-toolkit/templates/manifests/_job-pre-apply-cleanup.tpl
create mode 100644 ingress/templates/job-pre-apply-cleanup.yaml
create mode 100644 libvirt/templates/job-pre-apply-cleanup.yaml create mode 100644 libvirt/templates/job-pre-apply-cleanup.yaml
create mode 100644 mariadb/templates/job-pre-apply-cleanup.yaml create mode 100644 mariadb/templates/job-pre-apply-cleanup.yaml
create mode 100644 memcached/templates/job-pre-apply-cleanup.yaml create mode 100644 memcached/templates/job-pre-apply-cleanup.yaml
@ -48,7 +48,7 @@ its status as completed.
diff --git a/ceph-rgw/templates/job-pre-apply-cleanup.yaml b/ceph-rgw/templates/job-pre-apply-cleanup.yaml diff --git a/ceph-rgw/templates/job-pre-apply-cleanup.yaml b/ceph-rgw/templates/job-pre-apply-cleanup.yaml
new file mode 100644 new file mode 100644
index 00000000..ba0f0df3 index 00000000..2a1d6d91
--- /dev/null --- /dev/null
+++ b/ceph-rgw/templates/job-pre-apply-cleanup.yaml +++ b/ceph-rgw/templates/job-pre-apply-cleanup.yaml
@@ -0,0 +1,18 @@ @@ -0,0 +1,18 @@
@ -72,18 +72,18 @@ index 00000000..ba0f0df3
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml diff --git a/ceph-rgw/values.yaml b/ceph-rgw/values.yaml
index b312e4e9..59a92f8b 100644 index a0befdf0..d8e52d28 100644
--- a/ceph-rgw/values.yaml --- a/ceph-rgw/values.yaml
+++ b/ceph-rgw/values.yaml +++ b/ceph-rgw/values.yaml
@@ -34,6 +34,7 @@ images: @@ -35,6 +35,7 @@ images:
ks_endpoints: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' ks_endpoints: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
ks_service: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' ks_service: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
ks_user: 'docker.io/openstackhelm/heat:wallaby-ubuntu_focal' ks_user: 'docker.io/openstackhelm/heat:2024.1-ubuntu_jammy'
+ pre_apply_cleanup: 'docker.io/starlingx/stx-vault-manager:master-debian-stable-latest' + pre_apply_cleanup: 'docker.io/starlingx/stx-vault-manager:master-debian-stable-latest'
local_registry: local_registry:
active: false active: false
exclude: exclude:
@@ -690,6 +691,7 @@ manifests: @@ -724,6 +725,7 @@ manifests:
configmap_etc: true configmap_etc: true
deployment_rgw: true deployment_rgw: true
ingress_rgw: true ingress_rgw: true
@ -117,7 +117,7 @@ index 00000000..0e4424da
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index c9b90dd2..d445cf7c 100644 index bbfd4335..dfab7413 100644
--- a/gnocchi/values.yaml --- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml +++ b/gnocchi/values.yaml
@@ -52,6 +52,7 @@ images: @@ -52,6 +52,7 @@ images:
@ -128,7 +128,7 @@ index c9b90dd2..d445cf7c 100644
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@@ -638,6 +639,7 @@ manifests: @@ -639,6 +640,7 @@ manifests:
daemonset_statsd: true daemonset_statsd: true
deployment_api: true deployment_api: true
ingress_api: true ingress_api: true
@ -236,51 +236,6 @@ index 00000000..84f88bfc
+ restartPolicy: OnFailure + restartPolicy: OnFailure
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/ingress/templates/job-pre-apply-cleanup.yaml b/ingress/templates/job-pre-apply-cleanup.yaml
new file mode 100644
index 00000000..aa02ff78
--- /dev/null
+++ b/ingress/templates/job-pre-apply-cleanup.yaml
@@ -0,0 +1,18 @@
+{{/*
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/}}
+
+{{- if .Values.manifests.job_pre_apply_cleanup }}
+{{- $preApplyCleanupJob := dict "envAll" . "serviceName" "ingress" -}}
+{{ $preApplyCleanupJob | include "helm-toolkit.manifests.job_pre_apply_cleanup" }}
+{{- end }}
\ No newline at end of file
diff --git a/ingress/values.yaml b/ingress/values.yaml
index c531b1cf..a657db27 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -32,6 +32,7 @@ images:
keepalived: docker.io/osixia/keepalived:1.4.5
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/library/docker:17.07.0
+ pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
pull_policy: "IfNotPresent"
local_registry:
active: false
@@ -353,6 +354,7 @@ manifests:
secret_dhparam: false
service_error: true
service_ingress: true
+ job_pre_apply_cleanup: true
job_image_repo_sync: true
monitoring:
prometheus:
diff --git a/libvirt/templates/job-pre-apply-cleanup.yaml b/libvirt/templates/job-pre-apply-cleanup.yaml diff --git a/libvirt/templates/job-pre-apply-cleanup.yaml b/libvirt/templates/job-pre-apply-cleanup.yaml
new file mode 100644 new file mode 100644
index 00000000..7c44fd2b index 00000000..7c44fd2b
@ -307,25 +262,25 @@ index 00000000..7c44fd2b
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/libvirt/values.yaml b/libvirt/values.yaml diff --git a/libvirt/values.yaml b/libvirt/values.yaml
index 9cd24011..ee598a9b 100644 index 22ff231c..b3a4373b 100644
--- a/libvirt/values.yaml --- a/libvirt/values.yaml
+++ b/libvirt/values.yaml +++ b/libvirt/values.yaml
@@ -32,6 +32,7 @@ images: @@ -33,6 +33,7 @@ images:
ceph_config_helper: 'docker.io/openstackhelm/ceph-config-helper:ubuntu_focal_17.2.6-1-20230508' dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: docker.io/library/docker:17.07.0 image_repo_sync: docker.io/library/docker:17.07.0
kubectl: docker.io/bitnami/kubectl:latest
+ pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest + pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@@ -254,6 +255,7 @@ manifests: @@ -317,6 +318,7 @@ manifests:
configmap_bin: true configmap_bin: true
configmap_etc: true configmap_etc: true
daemonset_libvirt: true daemonset_libvirt: true
+ job_pre_apply_cleanup: true + job_pre_apply_cleanup: true
job_image_repo_sync: true job_image_repo_sync: true
network_policy: false network_policy: false
secret_registry: true role_cert_manager: false
diff --git a/mariadb/templates/job-pre-apply-cleanup.yaml b/mariadb/templates/job-pre-apply-cleanup.yaml diff --git a/mariadb/templates/job-pre-apply-cleanup.yaml b/mariadb/templates/job-pre-apply-cleanup.yaml
new file mode 100644 new file mode 100644
index 00000000..4c2cef3b index 00000000..4c2cef3b
@ -352,21 +307,21 @@ index 00000000..4c2cef3b
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/mariadb/values.yaml b/mariadb/values.yaml diff --git a/mariadb/values.yaml b/mariadb/values.yaml
index d58fff83..36797386 100644 index 61d2d3e7..d348f587 100644
--- a/mariadb/values.yaml --- a/mariadb/values.yaml
+++ b/mariadb/values.yaml +++ b/mariadb/values.yaml
@@ -31,6 +31,7 @@ images: @@ -31,6 +31,7 @@ images:
mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic mariadb_backup: quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_focal
ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal ks_user: docker.io/openstackhelm/heat:wallaby-ubuntu_focal
scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415 scripted_test: docker.io/openstackhelm/mariadb:ubuntu_focal-20210415
+ pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest + pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@@ -705,6 +706,7 @@ manifests: @@ -710,6 +711,7 @@ manifests:
configmap_services_tcp: true configmap_services_tcp: true
deployment_error: true deployment_error: false
deployment_ingress: true deployment_ingress: false
+ job_pre_apply_cleanup: true + job_pre_apply_cleanup: true
job_image_repo_sync: true job_image_repo_sync: true
cron_job_mariadb_backup: false cron_job_mariadb_backup: false
@ -397,7 +352,7 @@ index 00000000..f2d12578
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/memcached/values.yaml b/memcached/values.yaml diff --git a/memcached/values.yaml b/memcached/values.yaml
index 8694f3b7..bae58fb3 100644 index dd2bf3c6..26875d38 100644
--- a/memcached/values.yaml --- a/memcached/values.yaml
+++ b/memcached/values.yaml +++ b/memcached/values.yaml
@@ -123,6 +123,7 @@ images: @@ -123,6 +123,7 @@ images:
@ -442,18 +397,18 @@ index 00000000..3a29b239
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml diff --git a/openvswitch/values.yaml b/openvswitch/values.yaml
index c69b59ac..6ce0b6a6 100644 index 49006ea9..0e5a2f75 100644
--- a/openvswitch/values.yaml --- a/openvswitch/values.yaml
+++ b/openvswitch/values.yaml +++ b/openvswitch/values.yaml
@@ -24,6 +24,7 @@ images: @@ -24,6 +24,7 @@ images:
openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal openvswitch_vswitchd: docker.io/openstackhelm/openvswitch:latest-ubuntu_focal
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
image_repo_sync: docker.io/library/docker:17.07.0 image_repo_sync: docker.io/library/docker:17.07.0
+ pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest + pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@@ -204,6 +205,7 @@ manifests: @@ -206,6 +207,7 @@ manifests:
configmap_bin: true configmap_bin: true
daemonset: true daemonset: true
daemonset_ovs_vswitchd: true daemonset_ovs_vswitchd: true
@ -487,18 +442,18 @@ index 00000000..428d7c01
+{{- end }} +{{- end }}
\ No newline at end of file \ No newline at end of file
diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml diff --git a/rabbitmq/values.yaml b/rabbitmq/values.yaml
index aa9b52ff..d26ce9b1 100644 index 68a963a1..fbb98414 100644
--- a/rabbitmq/values.yaml --- a/rabbitmq/values.yaml
+++ b/rabbitmq/values.yaml +++ b/rabbitmq/values.yaml
@@ -40,6 +40,7 @@ images: @@ -40,6 +40,7 @@ images:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0 dep_check: quay.io/airshipit/kubernetes-entrypoint:latest-ubuntu_focal
scripted_test: docker.io/library/rabbitmq:3.9.0-management scripted_test: docker.io/library/rabbitmq:3.13.0-management
image_repo_sync: docker.io/library/docker:17.07.0 image_repo_sync: docker.io/library/docker:17.07.0
+ pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest + pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
pull_policy: "IfNotPresent" pull_policy: "IfNotPresent"
local_registry: local_registry:
active: false active: false
@@ -428,6 +429,7 @@ manifests: @@ -446,6 +447,7 @@ manifests:
configmap_etc: true configmap_etc: true
config_ipv6: false config_ipv6: false
ingress_management: true ingress_management: true
@ -507,5 +462,4 @@ index aa9b52ff..d26ce9b1 100644
job_image_repo_sync: true job_image_repo_sync: true
monitoring: monitoring:
-- --
2.46.0 2.34.1

28
openstack-helm-infra/debian/deb_folder/patches/0020-Add-Kubernetes-name-label-to-helm-toolkit-template.patch → openstack-helm-infra/debian/deb_folder/patches/0017-Add-Kubernetes-name-label-to-helm-toolkit-template.patch
View File

@ -7,11 +7,12 @@ This change allows the application framework status to correctly
represent the pods statuses by adding the correct label to every pod. represent the pods statuses by adding the correct label to every pod.
Signed-off-by: Johnny Chia <johnny.chialung@windriver.com> 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 + helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl | 1 +
ingress/templates/deployment-ingress.yaml | 2 --
mariadb/templates/deployment-ingress.yaml | 2 -- mariadb/templates/deployment-ingress.yaml | 2 --
3 files changed, 1 insertion(+), 4 deletions(-) 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 diff --git a/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl b/helm-toolkit/templates/snippets/_kubernetes_metadata_labels.tpl
index 48b53fa1..37482ebc 100644 index 48b53fa1..37482ebc 100644
@ -25,26 +26,6 @@ index 48b53fa1..37482ebc 100644
{{- if ($envAll.Values.pod).labels }} {{- if ($envAll.Values.pod).labels }}
{{- if hasKey $envAll.Values.pod.labels $component }} {{- if hasKey $envAll.Values.pod.labels $component }}
{{ index $envAll.Values.pod "labels" $component | toYaml }} {{ index $envAll.Values.pod "labels" $component | toYaml }}
diff --git a/ingress/templates/deployment-ingress.yaml b/ingress/templates/deployment-ingress.yaml
index dbd18833..4ea245f2 100644
--- a/ingress/templates/deployment-ingress.yaml
+++ b/ingress/templates/deployment-ingress.yaml
@@ -177,7 +177,6 @@ metadata:
labels:
{{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 4 }}
app: ingress-api
- app.kubernetes.io/name: "ingress-api"
app.kubernetes.io/instance: {{ $serviceAccountName }}
app.kubernetes.io/component: "ingress"
app.kubernetes.io/managed-by: {{ $envAll.Release.Service }}
@@ -199,7 +198,6 @@ spec:
{{ tuple $envAll "ingress" "server" | include "helm-toolkit.snippets.kubernetes_metadata_labels" | indent 8 }}
app.starlingx.io/component: {{ ternary "application" "platform" .Values.labels.isApplication }}
app: ingress-api
- app.kubernetes.io/name: "ingress-api"
app.kubernetes.io/instance: {{ $serviceAccountName }}
app.kubernetes.io/component: "ingress"
app.kubernetes.io/managed-by: {{ $envAll.Release.Service }}
diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml diff --git a/mariadb/templates/deployment-ingress.yaml b/mariadb/templates/deployment-ingress.yaml
index cf964061..91f496cb 100644 index cf964061..91f496cb 100644
--- a/mariadb/templates/deployment-ingress.yaml --- a/mariadb/templates/deployment-ingress.yaml
@ -66,5 +47,4 @@ index cf964061..91f496cb 100644
app.kubernetes.io/managed-by: {{ $envAll.Release.Service }} app.kubernetes.io/managed-by: {{ $envAll.Release.Service }}
{{- if $envAll.Chart.AppVersion }} {{- if $envAll.Chart.AppVersion }}
-- --
2.43.0 2.34.1

0
openstack-helm-infra/debian/deb_folder/patches/0021-Add-support-for-multiple-hosts-in-a-daemonset.patch → openstack-helm-infra/debian/deb_folder/patches/0018-Add-support-for-multiple-hosts-in-a-daemonset.patch
View File

32
openstack-helm-infra/debian/deb_folder/patches/0018-Remove-nginx-configuration-snippet.patch
View File

@ -1,32 +0,0 @@
From fb3efbc55f9933910ab4dffa58d36fc2921b5b97 Mon Sep 17 00:00:00 2001
From: Romulo Leite <romulo.leite@windriver.com>
Date: Thu, 11 Jul 2024 14:30:20 -0300
Subject: [PATCH] Remove nginx configuration-snippet
These snippet annotations are now disabled
by default for security matters
Signed-off-by: Romulo Leite <romulo.leite@windriver.com>
---
ingress/values.yaml | 5 -----
1 file changed, 5 deletions(-)
diff --git a/ingress/values.yaml b/ingress/values.yaml
index c42cdac4..92d038e5 100644
--- a/ingress/values.yaml
+++ b/ingress/values.yaml
@@ -164,11 +164,6 @@ network:
# .deployment.cluster.class
kubernetes.io/ingress.class: null
nginx.ingress.kubernetes.io/proxy-body-size: "0"
- nginx.ingress.kubernetes.io/configuration-snippet: |
- more_set_headers "X-Content-Type-Options: nosniff";
- more_set_headers "X-Frame-Options: deny";
- more_set_headers "X-Permitted-Cross-Domain-Policies: none";
- more_set_headers "Content-Security-Policy: script-src 'self'";
external_policy_local: false
dependencies:
--
2.34.1

31
openstack-helm-infra/debian/deb_folder/patches/series
View File

@ -2,20 +2,17 @@
0002-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch 0002-Partial-revert-of-31e3469d28858d7b5eb6355e88b6f49fd6.patch
0003-Fix-pod-restarts-on-all-workers-when-worker-added.patch 0003-Fix-pod-restarts-on-all-workers-when-worker-added.patch
0004-Add-io_thread_pool-for-rabbitmq.patch 0004-Add-io_thread_pool-for-rabbitmq.patch
0005-Enable-override-of-rabbitmq-probe-parameters.patch 0005-Enable-override-of-mariadb-server-probe-parameters.patch
0006-Enable-override-of-mariadb-server-probe-parameters.patch 0006-Add-mariadb-database-config-override-to-support-ipv6.patch
0007-Add-mariadb-database-config-override-to-support-ipv6.patch 0007-Enable-Values.conf.database.config_override-for-mari.patch
0008-Enable-Values.conf.database.config_override-for-mari.patch 0008-Allow-set-public-endpoint-url-for-all-openstack-types.patch
0009-Allow-set-public-endpoint-url-for-all-openstack-types.patch 0009-Add-GaleraDB-Secure-Replica-Traffic.patch
0010-Add-GaleraDB-Secure-Replica-Traffic.patch 0010-Fix-tls-in-openstack-helm-infra.patch
0011-Fix-tls-in-openstack-helm-infra.patch 0011-Remove-mariadb-tls.patch
0012-Remove-mariadb-tls.patch 0012-Remove-rabbitmq-tls.patch
0013-Remove-rabbitmq-tls.patch 0013-Update-openstack-Ingress-for-networking-api-v1.patch
0014-Update-openstack-Ingress-for-networking-api-v1.patch 0014-Update-libvirt-configuration-script-for-Debian.patch
0015-Update-libvirt-configuration-script-for-Debian.patch 0015-Add-app.starlingx.io-component-label-to-pods.patch
0016-Add-ServiceAccount-to-openvswitch-pod.patch 0016-Add-pre-apply-cleanup-Job-to-STX-O-Helm-charts.patch
0017-Add-app.starlingx.io-component-label-to-pods.patch 0017-Add-Kubernetes-name-label-to-helm-toolkit-template.patch
0018-Remove-nginx-configuration-snippet.patch 0018-Add-support-for-multiple-hosts-in-a-daemonset.patch
0019-Add-pre-apply-cleanup-Job-to-STX-O-Helm-charts.patch
0020-Add-Kubernetes-name-label-to-helm-toolkit-template.patch
0021-Add-support-for-multiple-hosts-in-a-daemonset.patch

1
openstack-helm-infra/debian/deb_folder/rules
View File

@ -11,7 +11,6 @@ override_dh_auto_build:
# Create the chart TGZ files. # Create the chart TGZ files.
make helm-toolkit make helm-toolkit
make gnocchi make gnocchi
make ingress
make libvirt make libvirt
make mariadb make mariadb
make memcached make memcached

10
openstack-helm-infra/debian/meta_data.yaml
View File

@ -1,11 +1,11 @@
--- ---
debname: openstack-helm-infra debname: openstack-helm-infra
debver: 1.0-1 debver: 1.1-0
dl_path: dl_path:
name: openstack-helm-infra-6b6ca9e26c5193e1920f65adfac2fd4b15c2f341.tar.gz name: openstack-helm-infra-05f2f45971abcf483189358d663e2b46c3fc2fe8.tar.gz
url: https://github.com/openstack/openstack-helm-infra/archive/6b6ca9e26c5193e1920f65adfac2fd4b15c2f341.tar.gz url: https://github.com/openstack/openstack-helm-infra/archive/05f2f45971abcf483189358d663e2b46c3fc2fe8.tar.gz
md5sum: 45cb758230a82ab64d618f92f10c676b md5sum: 7750b4bcf5bf77ee3285cb3325a2844f
sha256sum: d290a8622f985912bee98d0a63e458cbb75080384414303d7472782442fff2b7 sha256sum: 27cc39582e2c78126ded05e5de43359012868be32d226cdf53b43ee2813f5d16
src_files: src_files:
- files/repositories.yaml - files/repositories.yaml
revision: revision:

2
openstack-helm/debian/deb_folder/rules
View File

@ -5,7 +5,7 @@ export ROOT = debian/tmp
export APP_FOLDER = $(ROOT)/usr/lib/helm export APP_FOLDER = $(ROOT)/usr/lib/helm
export HELM_FOLDER=/usr/lib/helm export HELM_FOLDER=/usr/lib/helm
export TOOLKIT_VERSION = 0.2.53 export TOOLKIT_VERSION = 0.2.69
%: %:
dh $@ dh $@

2
stx-openstack-helm-fluxcd/debian/deb_folder/rules
View File

@ -5,7 +5,7 @@ export ROOT = debian/tmp
export APP_FOLDER = $(ROOT)/usr/lib/application export APP_FOLDER = $(ROOT)/usr/lib/application
export FLUXCD_FOLDER = $(ROOT)/usr/lib/fluxcd export FLUXCD_FOLDER = $(ROOT)/usr/lib/fluxcd
export HELM_FOLDER = /usr/lib/helm export HELM_FOLDER = /usr/lib/helm
export TOOLKIT_VERSION = 0.2.53 export TOOLKIT_VERSION = 0.2.69
%: %:
dh $@ dh $@

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/ceph-rgw-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -26,6 +26,8 @@ images:
tags: tags:
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223
ceph_rgw: null ceph_rgw: null
ceph_rgw_pool: null
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: null image_repo_sync: null
ceph_bootstrap: null ceph_bootstrap: null
ks_endpoints: docker.io/starlingx/stx-heat:master-debian-stable-latest ks_endpoints: docker.io/starlingx/stx-heat:master-debian-stable-latest

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/ceph-rgw/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: ceph-rgw chart: ceph-rgw
version: 0.1.27 version: 0.1.37
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

3
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/gnocchi/gnocchi-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -13,6 +13,7 @@ images:
db_init: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest db_init: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest
db_init_indexer: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest db_init_indexer: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest
db_sync: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest db_sync: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
gnocchi_api: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest gnocchi_api: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest
gnocchi_metricd: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest gnocchi_metricd: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest
gnocchi_resources_cleaner: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest gnocchi_resources_cleaner: docker.io/starlingx/stx-gnocchi:master-debian-stable-latest

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/gnocchi/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: gnocchi chart: gnocchi
version: 0.1.10 version: 0.1.16
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/libvirt/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: libvirt chart: libvirt
version: 0.1.20 version: 0.1.31
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

3
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/libvirt/libvirt-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -38,6 +38,7 @@ pod:
images: images:
tags: tags:
ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223 ceph_config_helper: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20201223
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: null image_repo_sync: null
libvirt: docker.io/starlingx/stx-libvirt:master-debian-stable-latest libvirt: docker.io/starlingx/stx-libvirt:master-debian-stable-latest
pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/mariadb/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: mariadb chart: mariadb
version: 0.2.31 version: 0.2.43
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/mariadb/mariadb-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -21,9 +21,11 @@ labels:
node_selector_value: enabled node_selector_value: enabled
images: images:
tags: tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
ingress: registry.k8s.io/ingress-nginx/controller:v1.7.0 ingress: registry.k8s.io/ingress-nginx/controller:v1.7.0
error_pages: registry.k8s.io/defaultbackend-amd64:1.5 error_pages: registry.k8s.io/defaultbackend-amd64:1.5
image_repo_sync: null image_repo_sync: null
prometheus_create_mysql_user: null
prometheus_mysql_exporter: null prometheus_mysql_exporter: null
prometheus_mysql_exporter_helm_tests: null prometheus_mysql_exporter_helm_tests: null
ks_user: docker.io/starlingx/stx-heat:master-debian-stable-latest ks_user: docker.io/starlingx/stx-heat:master-debian-stable-latest

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/memcached/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: memcached chart: memcached
version: 0.1.13 version: 0.1.14
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/memcached/memcached-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -33,6 +33,8 @@ monitoring:
enabled: false enabled: false
images: images:
tags: tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
memcached: docker.io/library/memcached:1.5.5
pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest pre_apply_cleanup: docker.io/starlingx/stx-vault-manager:master-debian-stable-latest
image_repo_sync: null image_repo_sync: null
prometheus_memcached_exporter: null prometheus_memcached_exporter: null

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/openvswitch/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: openvswitch chart: openvswitch
version: 0.1.14 version: 0.1.25
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

3
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/openvswitch/openvswitch-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -13,6 +13,7 @@ labels:
node_selector_value: enabled node_selector_value: enabled
images: images:
tags: tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: null image_repo_sync: null
openvswitch_db_server: docker.io/starlingx/stx-ovs:master-debian-stable-latest openvswitch_db_server: docker.io/starlingx/stx-ovs:master-debian-stable-latest
openvswitch_vswitchd: docker.io/starlingx/stx-ovs:master-debian-stable-latest openvswitch_vswitchd: docker.io/starlingx/stx-ovs:master-debian-stable-latest

4
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/rabbitmq/helmrelease.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -16,7 +16,7 @@ spec:
chart: chart:
spec: spec:
chart: rabbitmq chart: rabbitmq
version: 0.1.27 version: 0.1.36
sourceRef: sourceRef:
kind: HelmRepository kind: HelmRepository
name: starlingx name: starlingx

15
stx-openstack-helm-fluxcd/stx-openstack-helm-fluxcd/manifests/rabbitmq/rabbitmq-static-overrides.yaml
View File

@ -1,5 +1,5 @@
# #
# Copyright (c) 2022-2024 Wind River Systems, Inc. # Copyright (c) 2022-2025 Wind River Systems, Inc.
# #
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
# #
@ -21,6 +21,7 @@ labels:
node_selector_value: enabled node_selector_value: enabled
images: images:
tags: tags:
dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
image_repo_sync: null image_repo_sync: null
prometheus_rabbitmq_exporter: null prometheus_rabbitmq_exporter: null
prometheus_rabbitmq_exporter_helm_tests: null prometheus_rabbitmq_exporter_helm_tests: null
@ -49,10 +50,14 @@ pod:
operator: Exists operator: Exists
effect: NoSchedule effect: NoSchedule
probes: probes:
readiness: rabbitmq:
periodSeconds: 30 rabbitmq:
liveness: readiness:
periodSeconds: 30 params:
periodSeconds: 30
liveness:
params:
periodSeconds: 30
# TODO: Revert to upstream defaults once the following LP is resolved: # TODO: Revert to upstream defaults once the following LP is resolved:
# https://bugs.launchpad.net/starlingx/+bug/1814595. By changing this PV # https://bugs.launchpad.net/starlingx/+bug/1814595. By changing this PV
# size to 1Gi from the default 265Mi, this avoids the kernel hang from the # size to 1Gi from the default 265Mi, this avoids the kernel hang from the