starlingx
/
monitor-armada-app
Code Issues Proposed changes

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.

Change-Id: I6fa2494f75a7cd88f8f8f141f44ce34928a24956
Story: 2005733
Task: 36656
Signed-off-by: Matt Peters <matt.peters@windriver.com>
This commit is contained in:
Matt Peters 2019-10-25 11:37:48 -05:00
parent 44b43c4a9c
commit 433b216fbd
2 changed files with 57 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
monitor-helm/centos/monitor-helm.spec
View File

@ -28,6 +28,7 @@ Patch07: 0007-three-masters.patch
Patch08: 0008-Update-stx-monitor-for-kubernetes-API-1.16.patch
Patch09: 0009-add-curator-as-of-2019-10-10.patch
Patch10: 0010-Update-kube-state-metrics-1.8.0-to-commit-09daf19.patch
Patch11: 0011-update-init-container-env-to-include-node-name.patch
BuildRequires: helm
@ -46,6 +47,7 @@ Monitor Helm charts
%patch08 -p1
%patch09 -p1
%patch10 -p1
%patch11 -p1
%build
# initialize helm and build the toolkit

55
monitor-helm/files/0011-update-init-container-env-to-include-node-name.patch Normal file
View File

@ -0,0 +1,55 @@
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