From 35f8ad266f7d374848c7c7a1293449803526b5ef Mon Sep 17 00:00:00 2001
From: Stavros Kois <47820033+stavros-k@users.noreply.github.com>
Date: Mon, 2 May 2022 10:59:40 +0300
Subject: [PATCH] chore(netdata): add pod/namespace/node env's (#2600)

* feat(netdata): try to add agent for k8s discovery

* hell

* remove sd agent, as it only supports a handful of services

* try rootless

* root

* add gui options for cloud claim

* we don't use sd currently
---
 charts/incubator/netdata/Chart.yaml     |  2 +-
 charts/incubator/netdata/questions.yaml | 25 ++++++++++++++++++++++++-
 charts/incubator/netdata/values.yaml    | 24 ++++++++++++++++++++----
 3 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/charts/incubator/netdata/Chart.yaml b/charts/incubator/netdata/Chart.yaml
index f2189207880..6b6a39bbd71 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.3
+version: 0.0.4
 annotations:
   truecharts.org/catagories: |
     - utilities
diff --git a/charts/incubator/netdata/questions.yaml b/charts/incubator/netdata/questions.yaml
index 9f6758a7d97..e54381f23e3 100644
--- a/charts/incubator/netdata/questions.yaml
+++ b/charts/incubator/netdata/questions.yaml
@@ -74,7 +74,30 @@ questions:
                     - value: "OnDelete"
                       description: "(Legacy) OnDelete: ignore .spec.template changes"
 # Include{controllerExpert}
-  # Docker specific env
+  - variable: secret
+    group: "Container Configuration"
+    label: "Image Secrets"
+    schema:
+      additional_attrs: true
+      type: dict
+      attrs:
+        - variable: NETDATA_CLAIM_URL
+          label: "NETDATA_CLAIM_URL"
+          schema:
+            type: string
+            default: "https://app.netdata.cloud"
+        - variable: NETDATA_CLAIM_TOKEN
+          label: "NETDATA_CLAIM_TOKEN"
+          schema:
+            type: string
+            private: true
+            default: ""
+        - variable: NETDATA_CLAIM_ROOMS
+          label: "NETDATA_CLAIM_ROOMS"
+          schema:
+            type: string
+            private: true
+            default: ""
 # Include{containerConfig}
 
   - variable: service
diff --git a/charts/incubator/netdata/values.yaml b/charts/incubator/netdata/values.yaml
index c57d5ed42f6..19c27244a5d 100644
--- a/charts/incubator/netdata/values.yaml
+++ b/charts/incubator/netdata/values.yaml
@@ -25,9 +25,9 @@ rbac:
     - ""
     resources:
       - "pods"
-      - "services"
-      - "configmaps"
-      - "secrets"
+      # - "services"       # used by sd
+      # - "configmaps"     # used by sd
+      # - "secrets"        # used by sd
       - "nodes"
       - "nodes/metrics"
     verbs:
@@ -40,6 +40,22 @@ rbac:
     verbs:
       - "get"
 
+envValueFrom:
+  MY_NODE_NAME:
+    fieldRef:
+      fieldPath: spec.nodeName
+  MY_POD_NAMESPACE:
+    fieldRef:
+      fieldPath: metadata.namespace
+  MY_POD_NAME:
+    fieldRef:
+      fieldPath: metadata.name
+
+secret:
+  NETDATA_CLAIM_URL: ""
+  NETDATA_CLAIM_TOKEN: ""
+  NETDATA_CLAIM_ROOMS: ""
+
 service:
   main:
     ports:
@@ -106,9 +122,9 @@ initContainers:
     command: ["/bin/sh", "-c"]
     args:
       - >
-        echo "Creating config file...";
         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;