b1dfa417a4
This change upversion our base commit SHA for openstack-helm-infra,
in order to be more updated in comparison with
openstack/openstack-helm-infra main branch. It also ports all
StarlingX specific patches on top of it, dropping patches that are no
longer needed and updating what needs to be updated in order to be
applied on top of the new base SHA. Taking this chance to also update
the numbering/ordering of stx patches.
Chartmuseum build dependency was removed since a local helm chart server
is not really required for building openstack-helm-infra.
Helm Releases are updated with newest version of each helm chart.
Since the helm-toolkit chart was upversioned (0.2.19 -> 0.2.53), it is
also reflected on both the openstack-helm and stx-openstack-helm-fluxcd
build instructions.
Added ingress and error_pages images tags to both Ingress and MariaDB
static overrides in order to use the tags that are already being used by
the platform nginx-ingress-controller application.
ingress-nginx/controller was on v1.5.1 in the newest charts, was updated
to v1.7.0 that is already used. defaultbackend was on 1.4 in the newest
charts, was updated to -amd64:1.5.
Both are upgrades and not downgrades, so we should be fine and aligned
with images already delivered by default platform applications.
Finally, a new patch had to be developed (0016) in order to Add the
ServiceAccount creation back to openvswitch Daemonset definition.
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.
This fix will also be proposed to openstack/openstack-helm-infra [2]
[1] 73e2b3322d
[2] https://review.opendev.org/c/openstack/openstack-helm-infra/+/888504
Test Plan:
PASS - Build openstack-helm-infra package
PASS - Build openstack-helm package
PASS - build-pkgs -c -a
PASS - Build stx-openstack application tarball
PASS - Apply/Remove stx-openstack
PASS - Apply/Remove stx-openstack with TLS enabled
PASS - Run stx-openstack sanity tests (AIO-SX)*
* No major issue found, 2 TCs failed but does not seem related to this
upversion and if a consistent failure is confirmed a launchpad can be
created later.
Story: 2010715
Task: 47887
Depends-On: https://review.opendev.org/c/starlingx/SDO-rv-service/+/886739
Signed-off-by: Thales Elero Cervi <thaleselero.cervi@windriver.com>
Change-Id: Ie83075dbe3f60f43be7f3eb5c4870a2745a358ed
66 lines
3.8 KiB
Diff
66 lines
3.8 KiB
Diff
From b3829fef30e76fdf498fa1d0d35185f642dce5f6 Mon Sep 17 00:00:00 2001
|
|
From: Robert Church <robert.church@windriver.com>
|
|
Date: Mon, 8 Apr 2019 02:12:39 -0400
|
|
Subject: [PATCH 4/4] Partial revert of
|
|
31e3469d28858d7b5eb6355e88b6f49fd62032be
|
|
|
|
Suspect that new use of mergeOverwrite vs. merge is breaking the
|
|
per-host DaemonSet overrides.
|
|
|
|
Signed-off-by: Robert Church <robert.church@windriver.com>
|
|
---
|
|
.../templates/utils/_daemonset_overrides.tpl | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
index 40359f0f..69dcd800 100644
|
|
--- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
|
|
@@ -47,10 +47,10 @@ limitations under the License.
|
|
{{- $override_conf_copy := $host_data.conf }}
|
|
{{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
|
|
{{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
|
|
- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
|
|
+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
|
|
{{- $root_conf_copy2 := dict "conf" $merged_dict }}
|
|
{{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
|
|
- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
|
|
+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
|
|
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
|
|
{{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
|
|
|
|
@@ -87,10 +87,10 @@ limitations under the License.
|
|
{{- $override_conf_copy := $label_data.conf }}
|
|
{{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
|
|
{{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
|
|
- {{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
|
|
+ {{- $merged_dict := merge $override_conf_copy $root_conf_copy }}
|
|
{{- $root_conf_copy2 := dict "conf" $merged_dict }}
|
|
{{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
|
|
- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
|
|
+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
|
|
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
|
|
{{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}
|
|
|
|
@@ -185,7 +185,7 @@ limitations under the License.
|
|
{{- $root_conf_copy1 := omit $context.Values.conf "overrides" }}
|
|
{{- $root_conf_copy2 := dict "conf" $root_conf_copy1 }}
|
|
{{- $context_values := omit $context.Values "conf" }}
|
|
- {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
|
|
+ {{- $root_conf_copy3 := merge $context_values $root_conf_copy2 }}
|
|
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
|
|
{{- $_ := set $context.Values.__default "nodeData" $root_conf_copy4 }}
|
|
|
|
@@ -196,7 +196,7 @@ limitations under the License.
|
|
{{- range $current_dict := $context.Values.__daemonset_list }}
|
|
|
|
{{- $context_novalues := omit $context "Values" }}
|
|
- {{- $merged_dict := mergeOverwrite $context_novalues $current_dict.nodeData }}
|
|
+ {{- $merged_dict := merge $current_dict.nodeData $context_novalues }}
|
|
{{- $_ := set $current_dict "nodeData" $merged_dict }}
|
|
{{/* Deep copy original daemonset_yaml */}}
|
|
{{- $_ := set $context.Values "__daemonset_yaml" ($daemonset_yaml | toYaml | fromYaml) }}
|
|
--
|
|
2.25.1
|
|
|