meta-starlingx/meta-stx-flock/stx-monitor-armada-app/monitor-helm/0011-update-init-container-env-to-include-node-name.patch

   1 From 35a6b56e47710ea306608f44382b76022e236be0 Mon Sep 17 00:00:00 2001
   2 From: Matt Peters <matt.peters@windriver.com>
   3 Date: Fri, 25 Oct 2019 11:20:37 -0500
   4 Subject: [PATCH] update init container env to include node name
   5
   6 Update the init containers to have access to the same set of
   7 environment variables as the runtime containers.  Specifically
   8 NODE_NAME is required to ensure the name parameter is set
   9 properly.
  10 ---
  11  stable/filebeat/templates/daemonset.yaml   | 8 ++++++++
  12  stable/metricbeat/templates/daemonset.yaml | 8 ++++++++
  13  2 files changed, 16 insertions(+)
  14
  15 diff --git a/stable/filebeat/templates/daemonset.yaml b/stable/filebeat/templates/daemonset.yaml
  16 index 22b46df..2429892 100644
  17 --- a/stable/filebeat/templates/daemonset.yaml
  18 +++ b/stable/filebeat/templates/daemonset.yaml
  19 @@ -54,6 +54,14 @@ spec:
  20            readOnly: true
  21            subPath: filebeat.yml
  22          env:
  23 +        - name: POD_NAMESPACE
  24 +          valueFrom:
  25 +            fieldRef:
  26 +              fieldPath: metadata.namespace
  27 +        - name: NODE_NAME
  28 +          valueFrom:
  29 +            fieldRef:
  30 +              fieldPath: spec.nodeName
  31        ## make output.elasticsearch parms visible
  32        {{- range $key, $value := .Values.config}}
  33        {{- $configname := $key | upper | replace "." "_" -}}
  34 diff --git a/stable/metricbeat/templates/daemonset.yaml b/stable/metricbeat/templates/daemonset.yaml
  35 index 947e501..247304e 100644
  36 --- a/stable/metricbeat/templates/daemonset.yaml
  37 +++ b/stable/metricbeat/templates/daemonset.yaml
  38 @@ -49,6 +49,14 @@ spec:
  39            readOnly: true
  40            subPath: metricbeat.yml
  41          env:
  42 +        - name: POD_NAMESPACE
  43 +          valueFrom:
  44 +            fieldRef:
  45 +              fieldPath: metadata.namespace
  46 +        - name: NODE_NAME
  47 +          valueFrom:
  48 +            fieldRef:
  49 +              fieldPath: spec.nodeName
  50        ## make output.elasticsearch parms visible
  51        {{- range $key, $value := .Values.daemonset.config}}
  52        {{- $configname := $key | upper | replace "." "_" -}}
  53 --
  54 1.8.3.1
  55