openstack/openstack-helm-infra
Code Issues Proposed changes

Merge "Make more sections in daemonset overridable."

Browse Source
This commit is contained in:
Zuul 2020-03-03 10:01:06 +00:00 committed by Gerrit Code Review
commit 231bc0cadb
3 changed files with 8 additions and 4 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,10 +16,11 @@ limitations under the License.
{{- define "helm-toolkit.utils.daemonset_overrides" }}
{{- $daemonset := index . 0 }}
{{- $daemonset_yaml := index . 1 }}
{{- $daemonset_include := 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 }}
@ -201,6 +202,7 @@ 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,8 +271,7 @@ spec:
{{- $_ := include "helm-toolkit.utils.dependency_resolver" $dependencyOpts | toString | fromYaml }}
{{ tuple $envAll "pod_dependency" $serviceAccountName | include "helm-toolkit.snippets.kubernetes_pod_rbac_serviceaccount" }}
{{- $daemonset_yaml := list $daemonset $configMapName $serviceAccountName . | include "libvirt.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "libvirt.daemonset" }}
{{- $configmap_yaml := "libvirt.configmap.etc" }}
{{- list $daemonset $daemonset_yaml $configmap_yaml $configMapName . | include "helm-toolkit.utils.daemonset_overrides" }}
{{- list $daemonset $daemonset_include $configmap_yaml $configMapName . $serviceAccountName | include "helm-toolkit.utils.daemonset_overrides" }}
{{- end }}

3
tools/deployment/keystone-auth/070-keystone.sh
View File

@ -34,6 +34,9 @@ helm upgrade --install ldap ./ldap \
helm status ldap
# Install Keystone
cd ${OSH_PATH}
make keystone
cd -
helm upgrade --install keystone ${OSH_PATH}/keystone \
--namespace=openstack \
--values=${OSH_PATH}/keystone/values_overrides/ldap.yaml \