openstack/openstack-helm
Code Issues Proposed changes

Modify files related to overrides.

Browse Source 
As the functions of overrides are upgraded,the
files that depend on the functions of overrides
need to be modified synchronously.This patch and
https://review.opendev.org/#/c/707788/ depend on
each other.

Story: 2007291
Task: 38753
Depends-on: https://review.opendev.org/#/c/707788/
Change-Id: I048c8fe73f8f85df465f2c829812b75be1e4f130
Signed-off-by: songgongjun <gongjun.song@intel.com>
This commit is contained in:
songgongjun 2020-02-14 14:18:21 +08:00
parent f24e4dd0e5
commit 0389b54578
11 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
neutron/templates/daemonset-bagpipe-bgp.yaml
View File

@ -169,7 +169,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "bagpipe_bgp" -}}
{{- $_ := 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 "neutron.bagpipe_bgp.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.bagpipe_bgp.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-dhcp-agent.yaml
View File

@ -271,7 +271,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "dhcp" -}}
{{- $_ := 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 "neutron.dhcp_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.dhcp_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-l2gw-agent.yaml
View File

@ -156,7 +156,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "l2gateway" -}}
{{- $_ := 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 "neutron.l2gw_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.l2gw_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-l3-agent.yaml
View File

@ -279,7 +279,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "l3" -}}
{{- $_ := 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 "neutron.l3_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.l3_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-lb-agent.yaml
View File

@ -230,7 +230,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "lb_agent" -}}
{{- $_ := 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 "neutron.lb_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.lb_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-metadata-agent.yaml
View File

@ -219,7 +219,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "metadata" -}}
{{- $_ := 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 "neutron.metadata_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.metadata_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

5
neutron/templates/daemonset-netns-cleanup-cron.yaml
View File

@ -172,8 +172,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "netns_cleanup_cron" -}}
{{- $_ := 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 "neutron.netns_cleanup_cron.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.netns_cleanup_cron.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-ovs-agent.yaml
View File

@ -360,7 +360,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "ovs_agent" -}}
{{- $_ := 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 "neutron.ovs_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.ovs_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
neutron/templates/daemonset-sriov-agent.yaml
View File

@ -245,7 +245,7 @@ spec:
{{- $dependencyOpts := dict "envAll" $envAll "dependencyMixinParam" $envAll.Values.network.backend "dependencyKey" "sriov_agent" -}}
{{- $_ := 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 "neutron.sriov_agent.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "neutron.sriov_agent.daemonset" }}
{{- $configmap_yaml := "neutron.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 }}

4
nova/templates/daemonset-compute.yaml
View File

@ -414,7 +414,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 "nova.compute.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "nova.compute.daemonset" }}
{{- $configmap_yaml := "nova.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 }}

4
octavia/templates/daemonset-health-manager.yaml
View File

@ -153,7 +153,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 "octavia.health_manager.daemonset" | toString | fromYaml }}
{{- $daemonset_include := "octavia.health_manager.daemonset" }}
{{- $configmap_yaml := "octavia.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 }}