X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0011-update-init-container-env-to-include-node-name.patch;fp=meta-starlingx%2Fmeta-stx-flock%2Fstx-monitor-armada-app%2Fmonitor-helm%2F0011-update-init-container-env-to-include-node-name.patch;h=0000000000000000000000000000000000000000;hb=6fc6934434f70595536a387ece31bc30141cafb5;hp=97c619050f7ee5c0a0abc7f342763f829ecf63bc;hpb=eb1e26510491ba49de693ab3b0498edcb06be6c5;p=pti%2Frtp.git

diff --git a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0011-update-init-container-env-to-include-node-name.patch b/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0011-update-init-container-env-to-include-node-name.patch
deleted file mode 100644
index 97c6190..0000000
--- a/meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0011-update-init-container-env-to-include-node-name.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 35a6b56e47710ea306608f44382b76022e236be0 Mon Sep 17 00:00:00 2001
-From: Matt Peters <matt.peters@windriver.com>
-Date: Fri, 25 Oct 2019 11:20:37 -0500
-Subject: [PATCH] update init container env to include node name
-
-Update the init containers to have access to the same set of
-environment variables as the runtime containers.  Specifically
-NODE_NAME is required to ensure the name parameter is set
-properly.
----
- stable/filebeat/templates/daemonset.yaml   | 8 ++++++++
- stable/metricbeat/templates/daemonset.yaml | 8 ++++++++
- 2 files changed, 16 insertions(+)
-
-diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
-index 22b46df..2429892 100644
---- a/stable/filebeat/templates/daemonset.yaml
-+++ b/stable/filebeat/templates/daemonset.yaml
-@@ -54,6 +54,14 @@ spec:
-           readOnly: true
-           subPath: filebeat.yml
-         env:
-+        - name: POD_NAMESPACE
-+          valueFrom:
-+            fieldRef:
-+              fieldPath: metadata.namespace
-+        - name: NODE_NAME
-+          valueFrom:
-+            fieldRef:
-+              fieldPath: spec.nodeName
-       ## make output.elasticsearch parms visible
-       {{- range $key, $value := .Values.config}}
-       {{- $configname := $key | upper | replace "." "_" -}}
-diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
-index 947e501..247304e 100644
---- a/stable/metricbeat/templates/daemonset.yaml
-+++ b/stable/metricbeat/templates/daemonset.yaml
-@@ -49,6 +49,14 @@ spec:
-           readOnly: true
-           subPath: metricbeat.yml
-         env:
-+        - name: POD_NAMESPACE
-+          valueFrom:
-+            fieldRef:
-+              fieldPath: metadata.namespace
-+        - name: NODE_NAME
-+          valueFrom:
-+            fieldRef:
-+              fieldPath: spec.nodeName
-       ## make output.elasticsearch parms visible
-       {{- range $key, $value := .Values.daemonset.config}}
-       {{- $configname := $key | upper | replace "." "_" -}}
--- 
-1.8.3.1
-