From 0f7f3e2d64992932935c6f675a9a64d1b9b2adcf Mon Sep 17 00:00:00 2001 From: Douglas Camata Date: Thu, 12 Mar 2020 18:18:38 +0100 Subject: [PATCH] [stable/newrelic-infrastructure] Upgrade the New Relic k8s integration to v1.16.0 (#21435) * Upgrade the New Relic k8s integration to v1.16.0 Signed-off-by: Douglas Camata * Bump chart's patch instead of minor version Signed-off-by: Douglas Camata --- stable/newrelic-infrastructure/Chart.yaml | 4 ++-- stable/newrelic-infrastructure/README.md | 3 ++- stable/newrelic-infrastructure/templates/daemonset.yaml | 8 ++++++-- stable/newrelic-infrastructure/values.yaml | 4 ++-- 4 files changed, 12 insertions(+), 7 deletions(-) diff --git a/stable/newrelic-infrastructure/Chart.yaml b/stable/newrelic-infrastructure/Chart.yaml index 5826bcfc5b05..fd04c76296dc 100644 --- a/stable/newrelic-infrastructure/Chart.yaml +++ b/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.25 -appVersion: 1.15.0 +version: 0.13.26 +appVersion: 1.16.0 home: https://hub.docker.com/r/newrelic/infrastructure-k8s/ source: - https://github.com/kubernetes/kubernetes/tree/master/examples/newrelic-infrastructure diff --git a/stable/newrelic-infrastructure/README.md b/stable/newrelic-infrastructure/README.md index 801543b388cf..aa0c0268a6ba 100644 --- a/stable/newrelic-infrastructure/README.md +++ b/stable/newrelic-infrastructure/README.md @@ -14,6 +14,7 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset. | `customSecretLicenseKey` | Key in the Secret object where the license key is stored. | | | `config` | A `newrelic.yml` file if you wish to provide. | | | `integrations_config` | List of Integrations configuration to monitor services running on Kubernetes. More information on can be found [here](https://docs.newrelic.com/docs/integrations/kubernetes-integration/link-apps-services/monitor-services-running-kubernetes). | | +| `disableKubeStateMetrics` | Disables kube-state-metrics data parsing if the value is ` true`. | `false` | | `kubeStateMetricsUrl` | If provided, the discovery process for kube-state-metrics endpoint won't be triggered. Example: http://172.17.0.3:8080 | | | `kubeStateMetricsPodLabel` | If provided, the kube-state-metrics pod will be discovered using this label. (should be `true` on target pod) | | | `kubeStateMetricsTimeout` | Timeout for accessing kube-state-metrics in milliseconds. If not set the newrelic default is 5000 | | @@ -24,7 +25,7 @@ This chart will deploy the New Relic Infrastructure agent as a Daemonset. | `privileged` | Enable privileged mode. | `true` | | `image.repository` | The container to pull. | `newrelic/infrastructure` | | `image.pullPolicy` | The pull policy. | `IfNotPresent` | -| `image.tag` | The version of the container to pull. | `1.15.0` | +| `image.tag` | The version of the container to pull. | `1.16.0` | | `resources` | Any resources you wish to assign to the pod. | See Resources below | | `verboseLog` | Should the agent log verbosely. (Boolean) | `false` | | `priorityClassName` | Scheduling priority of the pod | `nil` | diff --git a/stable/newrelic-infrastructure/templates/daemonset.yaml b/stable/newrelic-infrastructure/templates/daemonset.yaml index 3b292030cb17..784aa06bcffa 100644 --- a/stable/newrelic-infrastructure/templates/daemonset.yaml +++ b/stable/newrelic-infrastructure/templates/daemonset.yaml @@ -55,6 +55,10 @@ spec: {{- end }} - name: "CLUSTER_NAME" value: {{ include "newrelic.cluster" . }} + {{- if .Values.disableKubeStateMetrics }} + - name: "DISABLE_KUBE_STATE_METRICS" + value: {{ .Values.kubeStateMetricsPodLabel | quote }} + {{- end }} {{- if .Values.kubeStateMetricsUrl }} - name: "KUBE_STATE_METRICS_URL" value: {{ .Values.kubeStateMetricsUrl | quote }} @@ -116,7 +120,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,KUBE_STATE_METRICS_POD_LABEL,TIMEOUT,ETCD_TLS_SECRET_NAME,ETCD_TLS_SECRET_NAMESPACE,API_SERVER_SECURE_PORT,KUBE_STATE_METRICS_SCHEME,KUBE_STATE_METRICS_PORT,SCHEDULER_ENDPOINT_URL,ETCD_ENDPOINT_URL,CONTROLLER_MANAGER_ENDPOINT_URL,API_SERVER_ENDPOINT_URL" + value: "KUBERNETES_SERVICE_HOST,KUBERNETES_SERVICE_PORT,CLUSTER_NAME,CADVISOR_PORT,NRK8S_NODE_NAME,KUBE_STATE_METRICS_URL,KUBE_STATE_METRICS_POD_LABEL,TIMEOUT,ETCD_TLS_SECRET_NAME,ETCD_TLS_SECRET_NAMESPACE,API_SERVER_SECURE_PORT,KUBE_STATE_METRICS_SCHEME,KUBE_STATE_METRICS_PORT,SCHEDULER_ENDPOINT_URL,ETCD_ENDPOINT_URL,CONTROLLER_MANAGER_ENDPOINT_URL,API_SERVER_ENDPOINT_URL,DISABLE_KUBE_STATE_METRICS" {{- if .Values.verboseLog }} - name: NRIA_VERBOSE value: "1" @@ -194,7 +198,7 @@ spec: {{- if .Values.integrations_config }} - name: nri-integrations-cfg-volume configMap: - name: {{ template "newrelic.fullname" . }}-integrations-cfg + name: {{ template "newrelic.fullname" . }}-integrations-cfg {{- end }} {{- if $.Values.priorityClassName }} priorityClassName: {{ $.Values.priorityClassName }} diff --git a/stable/newrelic-infrastructure/values.yaml b/stable/newrelic-infrastructure/values.yaml index f9c92d338406..c8bd4ec97bd1 100644 --- a/stable/newrelic-infrastructure/values.yaml +++ b/stable/newrelic-infrastructure/values.yaml @@ -20,7 +20,7 @@ # # kubeStateMetricsUrl - if provided, the discovery process for kube-state-metrics endpoint won't be triggered # Only HTTP is accepted. This is an example value: http://172.17.0.3:8080 -# kubeStateMetricsUrl: +# disableKubeStateMetrics - disables KSM parsing by the DaemonSet. Defaults to "false" if not provided. verboseLog: false @@ -29,7 +29,7 @@ verboseLog: false image: repository: newrelic/infrastructure-k8s - tag: 1.15.0 + tag: 1.16.0 pullPolicy: IfNotPresent resources: