From 8d0b5810e643a1207a5a49af7fbdc7cf15d568b1 Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 2 May 2022 18:23:29 +0300
Subject: [PATCH] chore(netdata): use configmap for readability and
 extendability (#2601)

* chore(netdata): use configmap for readability

* whoops

* typo

* mount confimap on initcont

* subpath

* type file

* add /dev
---
 charts/incubator/netdata/Chart.yaml           |  2 +-
 .../incubator/netdata/templates/common.yaml   | 21 ++++++++++++++++++-
 .../netdata/templates/configmap.yaml          | 16 ++++++++++++++
 charts/incubator/netdata/values.yaml          | 17 ++++++++++-----
 4 files changed, 49 insertions(+), 7 deletions(-)
 create mode 100644 charts/incubator/netdata/templates/configmap.yaml

diff --git a/charts/incubator/netdata/Chart.yaml b/charts/incubator/netdata/Chart.yaml
index 6b6a39bbd71..9d5e0c10a52 100644
--- a/charts/incubator/netdata/Chart.yaml
+++ b/charts/incubator/netdata/Chart.yaml
@@ -18,7 +18,7 @@ maintainers:
 name: netdata
 sources:
 - https://github.com/netdata
-version: 0.0.4
+version: 0.0.5
 annotations:
   truecharts.org/catagories: |
     - utilities
diff --git a/charts/incubator/netdata/templates/common.yaml b/charts/incubator/netdata/templates/common.yaml
index a6613c2ce21..88ed46b597d 100644
--- a/charts/incubator/netdata/templates/common.yaml
+++ b/charts/incubator/netdata/templates/common.yaml
@@ -1 +1,20 @@
-{{ include "common.all" . }}
+{{- include "common.setup" . }}
+
+{{/* Append the hardcoded settings */}}
+{{- define "netdata.harcodedValues" -}}
+persistence:
+  netdata-configs:
+    enabled: "true"
+    mountPath: "/etc/netdata/truecharts-defaults/.netdata.conf"
+    subPath: "netdata-conf"
+    type: "custom"
+    volumeSpec:
+      configMap:
+        name: {{ printf "%v-configs" (include "common.names.fullname" .) }}
+{{- end -}}
+{{- $_ := mergeOverwrite .Values (include "netdata.harcodedValues" . | fromYaml) -}}
+
+{{- include "netdata.configmap" . }}
+
+{{/* Render the templates */}}
+{{ include "common.postSetup" . }}
diff --git a/charts/incubator/netdata/templates/configmap.yaml b/charts/incubator/netdata/templates/configmap.yaml
new file mode 100644
index 00000000000..82244be10e5
--- /dev/null
+++ b/charts/incubator/netdata/templates/configmap.yaml
@@ -0,0 +1,16 @@
+{{- define "netdata.configmap" -}}
+
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ include "common.names.fullname" . }}-configs
+  labels:
+    {{- include "common.labels" . | nindent 4 }}
+data:
+  netdata-conf: |-
+    [global]
+      memory mode = dbengine
+      dbengine multihost disk space = 4096
+      page cache size = 64
+{{- end -}}
diff --git a/charts/incubator/netdata/values.yaml b/charts/incubator/netdata/values.yaml
index 19c27244a5d..fc962418a8e 100644
--- a/charts/incubator/netdata/values.yaml
+++ b/charts/incubator/netdata/values.yaml
@@ -99,6 +99,12 @@ persistence:
     hostPath: "/proc"
     mountPath: "/host/proc"
     readOnly: true
+  dev:
+    enabled: true
+    type: hostPath
+    hostPath: "/dev"
+    mountPath: "/host/dev"
+    readOnly: true
   sys:
     enabled: true
     type: hostPath
@@ -119,16 +125,17 @@ initContainers:
     volumeMounts:
     - name: config
       mountPath: "/etc/netdata"
+    - name: netdata-configs
+      mountPath: "/etc/netdata/truecharts-defaults/.netdata.conf"
+      subPath: netdata-conf
+      readOnly: true
     command: ["/bin/sh", "-c"]
     args:
       - >
         export configfile=/etc/netdata/netdata.conf;
         if [ ! -f $configfile ]; then
-          echo "Creating config file...";
-          echo '[global]' > $configfile;
-          echo '  memory mode = dbengine' >> $configfile;
-          echo '  dbengine multihost disk space = 4096' >> $configfile;
-          echo '  page cache size = 64' >> $configfile;
+          cp /etc/netdata/truecharts-defaults/.netdata.conf $configfile
         else
           echo "Config file exists, skipping...";
         fi;
+        cat $configfile