openstack/openstack-helm-infra
Code Issues Proposed changes

Restore overrides functionality after regression

Browse Source 
Revert 833d426da8

https://review.opendev.org/#/c/667022 introduced a regression in the
overrides functionality, which caused the corresponding gate test to
fail. This "fixed" a problem by breaking the override capability.

This patchset reverts the previous to restore override functionality and
make gates green again. Deep copy is added in order to resolve the
original problem that 667022 attempted to resolve.

Change-Id: I6c052c0fabe0067612d6a3d9d3bfac4df59202d7
This commit is contained in:
Anderson, Craig (ca846m) 2019-07-19 18:12:23 -07:00 committed by Pete Birley
parent b7a7e81056
commit ab8c81f2ee
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceph-osd/templates/utils/_osd_daemonset_overrides.tpl
View File

@ -53,10 +53,11 @@ limitations under the License.
{{/* apply overrides */}} {{/* apply overrides */}}
{{- $override_conf_copy := $host_data.conf }} {{- $override_conf_copy := $host_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }} {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $merged_dict := merge $override_conf_copy $root_conf_copy }} {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
{{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }} {{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }} {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
{{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }} {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }} {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $current_dict "nodeData" $root_conf_copy4 }} {{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
@ -92,10 +93,11 @@ limitations under the License.
{{/* apply overrides */}} {{/* apply overrides */}}
{{- $override_conf_copy := $label_data.conf }} {{- $override_conf_copy := $label_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }} {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $merged_dict := merge $override_conf_copy $root_conf_copy }} {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
{{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }} {{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }} {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
{{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }} {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }} {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }} {{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}

14
helm-toolkit/templates/utils/_daemonset_overrides.tpl
View File

@ -47,10 +47,11 @@ limitations under the License.
{{/* apply overrides */}} {{/* apply overrides */}}
{{- $override_conf_copy := $host_data.conf }} {{- $override_conf_copy := $host_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }} {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $merged_dict := merge $override_conf_copy $root_conf_copy }} {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
{{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }} {{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }} {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
{{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }} {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }} {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $current_dict "nodeData" $root_conf_copy4 }} {{- $_ := set $current_dict "nodeData" $root_conf_copy4 }}
@ -86,10 +87,11 @@ limitations under the License.
{{/* apply overrides */}} {{/* apply overrides */}}
{{- $override_conf_copy := $label_data.conf }} {{- $override_conf_copy := $label_data.conf }}
{{- $root_conf_copy := omit $context.Values.conf "overrides" }} {{/* Deep copy to prevent https://storyboard.openstack.org/#!/story/2005936 */}}
{{- $merged_dict := merge $override_conf_copy $root_conf_copy }} {{- $root_conf_copy := omit ($context.Values.conf | toYaml | fromYaml) "overrides" }}
{{- $merged_dict := mergeOverwrite $root_conf_copy $override_conf_copy }}
{{- $root_conf_copy2 := dict "conf" $merged_dict }} {{- $root_conf_copy2 := dict "conf" $merged_dict }}
{{- $context_values := omit $context.Values "conf" }} {{- $context_values := omit (omit ($context.Values | toYaml | fromYaml) "conf") "__daemonset_list" }}
{{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }} {{- $root_conf_copy3 := mergeOverwrite $context_values $root_conf_copy2 }}
{{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }} {{- $root_conf_copy4 := dict "Values" $root_conf_copy3 }}
{{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }} {{- $_ := set $context.Values.__current_label "nodeData" $root_conf_copy4 }}

2
tools/gate/divingbell/divingbell-tests.sh
View File

@ -20,6 +20,6 @@ git clone https://opendev.org/airship/divingbell
cd divingbell cd divingbell
mkdir build mkdir build
ln -s ../openstack-helm-infra build/openstack-helm-infra ln -s ../openstack-helm-infra build/openstack-helm-infra
export HELM_ARTIFACT_URL=https://storage.googleapis.com/kubernetes-helm/helm-v2.13.0-linux-amd64.tar.gz export HELM_ARTIFACT_URL=https://storage.googleapis.com/kubernetes-helm/helm-v2.14.1-linux-amd64.tar.gz
./tools/gate/scripts/010-build-charts.sh ./tools/gate/scripts/010-build-charts.sh
sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh sudo SKIP_BASE_TESTS=true ./tools/gate/scripts/020-test-divingbell.sh