1 From 47315e28d44cff586f6fff026dd00e61c2c77bcd Mon Sep 17 00:00:00 2001
2 From: Gerry Kopec <Gerry.Kopec@windriver.com>
3 Date: Wed, 9 Jan 2019 20:11:33 -0500
4 Subject: [PATCH 1/4] Allow multiple containers per daemonset pod
6 Remove code that restricted daemonset pods to single containers.
7 Container names will default to name from helm chart template.
8 Required for nova cold migrations to work.
12 Change-Id: Icce660415d43baefbbf768a785c5dedf04ea2930
13 Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
14 (cherry picked from commit 7ca30319f418cd39db5ecf44cce5fb5fe39c458e)
15 Signed-off-by: Robert Church <robert.church@windriver.com>
17 helm-toolkit/templates/utils/_daemonset_overrides.tpl | 7 -------
18 1 file changed, 7 deletions(-)
20 diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
21 index e352bc9..10ab166 100644
22 --- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
23 +++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
24 @@ -225,13 +225,6 @@ limitations under the License.
25 {{- if not $context.Values.__daemonset_yaml.metadata.name }}{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" dict }}{{- end }}
26 {{- $_ := set $context.Values.__daemonset_yaml.metadata "name" $current_dict.dns_1123_name }}
28 - {{/* set container name
29 - assume not more than one container is defined */}}
30 - {{- $container := first $context.Values.__daemonset_yaml.spec.template.spec.containers }}
31 - {{- $_ := set $container "name" $current_dict.dns_1123_name }}
32 - {{- $cont_list := list $container }}
33 - {{- $_ := set $context.Values.__daemonset_yaml.spec.template.spec "containers" $cont_list }}
35 {{/* cross-reference configmap name to container volume definitions */}}
36 {{- $_ := set $context.Values "__volume_list" list }}
37 {{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}