[newrelic-infra] Add cluster name custom attribute (helm#11053)

* [newrelic-infra] Add cluster name custom attribute Signed-off-by: JF Joly <[email protected]> * [newrelic-infra] Increment chart version number Signed-off-by: JF Joly <[email protected]> * Move custom attributes to values.yaml Signed-off-by: JF Joly <[email protected]> * Updating quotes for the custom attribute value Signed-off-by: JF Joly <[email protected]>
agolo · Feb 14, 2019 · f077671 · f077671
1 parent 3ab100a
commit f077671
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/stable/newrelic-infrastructure/Chart.yaml b/stable/newrelic-infrastructure/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: A Helm chart to deploy the New Relic Infrastructure Agent as a DaemonSet
 name: newrelic-infrastructure
-version: 0.7.0
+version: 0.8.0
 appVersion: 1.3.1
 home: https://hub.docker.com/r/newrelic/infrastructure/
 source:

diff --git a/stable/newrelic-infrastructure/templates/daemonset.yaml b/stable/newrelic-infrastructure/templates/daemonset.yaml
@@ -57,6 +57,8 @@ spec:
                 fieldRef:
                   apiVersion: "v1"
                   fieldPath: "spec.nodeName"
+            - name: "NRIA_CUSTOM_ATTRIBUTES"
+              value: {{ .Values.customAttribues }}
             - name: "NRIA_PASSTHROUGH_ENVIRONMENT"
               value: "KUBERNETES_SERVICE_HOST,KUBERNETES_SERVICE_PORT,CLUSTER_NAME,CADVISOR_PORT,NRK8S_NODE_NAME,KUBE_STATE_METRICS_URL,TIMEOUT"
             {{- if .Values.verboseLog }}

diff --git a/stable/newrelic-infrastructure/values.yaml b/stable/newrelic-infrastructure/values.yaml
@@ -89,3 +89,6 @@ nodeSelector: {}
 tolerations: []
 
 updateStrategy: RollingUpdate
+
+# Custom attributes to be passed to the New Relic agent
+customAttribues: "'{\"clusterName\":\"$(CLUSTER_NAME)\"}'"