X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm-infra%2F0001-Allow-multiple-containers-per-daemonset-pod.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-openstack-armada-app%2Fopenstack-helm-infra%2F0001-Allow-multiple-containers-per-daemonset-pod.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=c138f58f13dcec27a2773495e07ed43973fd434f;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0001-Allow-multiple-containers-per-daemonset-pod.patch b/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0001-Allow-multiple-containers-per-daemonset-pod.patch
deleted file mode 100644
index c138f58..0000000
--- a/meta-starlingx/meta-stx-flock/stx-openstack-armada-app/openstack-helm-infra/0001-Allow-multiple-containers-per-daemonset-pod.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 47315e28d44cff586f6fff026dd00e61c2c77bcd Mon Sep 17 00:00:00 2001
-From: Gerry Kopec <Gerry.Kopec@windriver.com>
-Date: Wed, 9 Jan 2019 20:11:33 -0500
-Subject: [PATCH 1/4] Allow multiple containers per daemonset pod
-
-Remove code that restricted daemonset pods to single containers.
-Container names will default to name from helm chart template.
-Required for nova cold migrations to work.
-
-Story: 2003876
-Task: 26735
-Change-Id: Icce660415d43baefbbf768a785c5dedf04ea2930
-Signed-off-by: Gerry Kopec <Gerry.Kopec@windriver.com>
-(cherry picked from commit 7ca30319f418cd39db5ecf44cce5fb5fe39c458e)
-Signed-off-by: Robert Church <robert.church@windriver.com>
----
- helm-toolkit/templates/utils/_daemonset_overrides.tpl | 7 -------
- 1 file changed, 7 deletions(-)
-
-diff --git a/helm-toolkit/templates/utils/_daemonset_overrides.tpl b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-index e352bc9..10ab166 100644
---- a/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-+++ b/helm-toolkit/templates/utils/_daemonset_overrides.tpl
-@@ -225,13 +225,6 @@ limitations under the License.
-     {{- if not $context.Values.__daemonset_yaml.metadata.name }}{{- $_ := set $context.Values.__daemonset_yaml.metadata "name" dict }}{{- end }}
-     {{- $_ := set $context.Values.__daemonset_yaml.metadata "name" $current_dict.dns_1123_name }}
- 
--    {{/* set container name
--    assume not more than one container is defined */}}
--    {{- $container := first $context.Values.__daemonset_yaml.spec.template.spec.containers }}
--    {{- $_ := set $container "name" $current_dict.dns_1123_name }}
--    {{- $cont_list := list $container }}
--    {{- $_ := set $context.Values.__daemonset_yaml.spec.template.spec "containers" $cont_list }}
--
-     {{/* cross-reference configmap name to container volume definitions */}}
-     {{- $_ := set $context.Values "__volume_list" list }}
-     {{- range $current_volume := $context.Values.__daemonset_yaml.spec.template.spec.volumes }}
--- 
-2.7.4
-