openstack/openstack-helm-infra
Code Issues Proposed changes

Revert "Make more sections in daemonset overridable."

Browse Source 
This reverts commit d74e937726.

This change looks ok, but we need use cases, and tests to make a change to such a complex and heavily used part of osh

(see: http://eavesdrop.openstack.org/meetings/openstack_helm/2020/openstack_helm.2020-03-03-16.00.log.html)

Change-Id: Ice77dcb53fee0e7a64ade9415f9cbf25f5d51d0e
This commit is contained in:
Pete Birley 2020-03-13 14:07:30 +00:00 committed by Gage Hugo
parent d74e937726
commit 0a2ecabb2b
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,11 +16,10 @@ limitations under the License.
{{- define "helm-toolkit.utils.daemonset_overrides" }}
{{- $daemonset := index . 0 }}
{{- $daemonset_include := index . 1 }}
{{- $daemonset_yaml := index . 1 }}
{{- $configmap_include := index . 2 }}
{{- $configmap_name := index . 3 }}
{{- $context := index . 4 }}
{{- $serviceAccountName := index . 5 }}
{{- $_ := unset $context ".Files" }}
{{- $daemonset_root_name := printf (print $context.Chart.Name "_" $daemonset) }}
{{- $_ := set $context.Values "__daemonset_list" list }}
@ -202,7 +201,6 @@ limitations under the License.
{{- $merged_dict := mergeOverwrite $context_novalues $current_dict.nodeData }}
{{- $_ := set $current_dict "nodeData" $merged_dict }}
{{/* Deep copy original daemonset_yaml */}}
{{- $daemonset_yaml := list $daemonset $configmap_name $serviceAccountName $current_dict.nodeData | include $daemonset_include | toString | fromYaml }}
{{- $_ := set $context.Values "__daemonset_yaml" ($daemonset_yaml | toYaml | fromYaml) }}
{{/* name needs to be a DNS-1123 compliant name. Ensure lower case */}}

5
libvirt/templates/daemonset-libvirt.yaml
View File

@ -271,7 +271,8 @@ spec:
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $daemonset_include := "libvirt.daemonset" }}
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "libvirt.daemonset" | toString | fromYaml }}
{{- $configmap_yaml := "libvirt.configmap.etc" }}
{{- list $daemonset $daemonset_include $configmap_yaml $configMapName . $serviceAccountName | include "helm-toolkit.utils.daemonset_overrides" }}
{{- list $daemonset $daemonset_yaml $configmap_yaml $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}