[stable/newrelic-infrastructure] Upgrade k8s integration and add new configuration (#19537)

* Upgrade k8s integration and add new configuration

Signed-off-by: Douglas Camata <dcamata@newrelic.com>

* Add etcd mtls configuration env vars to the passthrough

Signed-off-by: Douglas Camata <dcamata@newrelic.com>

* Fix typo

Signed-off-by: Douglas Camata <dcamata@newrelic.com>

stable/newrelic-infrastructure/Chart.yaml

@@ -1,8 +1,8 @@
 apiVersion: v1
 description: A Helm chart to deploy the New Relic Infrastructure Agent as a DaemonSet
 name: newrelic-infrastructure
-version: 0.13.14
-appVersion: 1.10.2
+version: 0.13.15
+appVersion: 1.11.0
 home: https://hub.docker.com/r/newrelic/infrastructure-k8s/
 source:
   - https://github.com/kubernetes/kubernetes/tree/master/examples/newrelic-infrastructure

stable/newrelic-infrastructure/README.md

@@ -29,6 +29,8 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset.
 | `updateStrategy`                | Strategy for DaemonSet updates (requires Kubernetes >= 1.6)  | `RollingUpdate`            |
 | `serviveAccount.create`         | If true, a service account would be created and assigned to the deployment | true |
 | `serviveAccount.name`           | The service account to assign to the deployment. If `serviveAccount.create` is true then this name will be used when creating the service account | |
+| `etcdTlsSecretName`             | Name of the secret containing the cacert, cert and key used for setting the mTLS config for retrieving metrics from ETCD. | |
+| `etcdTlsSecretNamespace`        | Namespace where the secret specified in `etcdTlsSecretName` was created. | `default`  |
 
 ## Example
 

stable/newrelic-infrastructure/templates/daemonset.yaml

@@ -59,6 +59,14 @@ spec:
             - name: TIMEOUT
               value: {{ .Values.kubeStateMetricsTimeout | quote }}
             {{- end }}
+            {{- if .Values.etcdTlsSecretName }}
+            - name: ETCD_TLS_SECRET_NAME
+              value: {{ .Values.etcdTlsSecretName | quote }}
+            {{- if .Values.etcdTlsSecretNamespace }}
+            - name: ETCD_TLS_SECRET_NAMESPACE
+              value: {{ .Values.etcdTlsSecretNamespace | quote }}
+            {{- end }}
+            {{- end }}
             - name: "NRIA_DISPLAY_NAME"
               valueFrom:
                 fieldRef:
@@ -72,7 +80,7 @@ spec:
             - 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"
+              value: "KUBERNETES_SERVICE_HOST,KUBERNETES_SERVICE_PORT,CLUSTER_NAME,CADVISOR_PORT,NRK8S_NODE_NAME,KUBE_STATE_METRICS_URL,TIMEOUT,ETCD_TLS_SECRET_NAME,ETCD_TLS_SECRET_NAMESPACE"
             {{- if .Values.verboseLog }}
             - name: NRIA_VERBOSE
               value: "1"

stable/newrelic-infrastructure/values.yaml

@@ -29,7 +29,7 @@ verboseLog: false
 
 image:
   repository: newrelic/infrastructure-k8s
-  tag: 1.10.2
+  tag: 1.11.0
   pullPolicy: IfNotPresent
 
 resources:
@@ -109,3 +109,6 @@ updateStrategy: RollingUpdate
 
 # Custom attributes to be passed to the New Relic agent
 customAttribues: "'{\"clusterName\":\"$(CLUSTER_NAME)\"}'"
+
+# etcdTlsSecretName: newrelic-infra-etcd-tls-secret
+etcdTlsSecretNamespace: default