From 1916fb16547133031647355c28ab6d5dea3e6f71 Mon Sep 17 00:00:00 2001 From: Arvind Iyengar Date: Mon, 7 Jun 2021 22:59:39 -0700 Subject: [PATCH] Update rancher-node-exporter to new base a05f7b8888d6174827b815aa097d64b94f00af3e (cherry picked from commit dbc71f3dfce68d46fff8e9b5364e41602b953bab) --- .../generated-changes/patch/Chart.yaml.patch | 6 ++---- .../patch/templates/daemonset.yaml.patch | 12 +++--------- .../patch/templates/psp.yaml.patch | 13 ------------- .../generated-changes/patch/values.yaml.patch | 18 +----------------- packages/rancher-node-exporter/package.yaml | 2 +- 5 files changed, 7 insertions(+), 44 deletions(-) delete mode 100644 packages/rancher-node-exporter/generated-changes/patch/templates/psp.yaml.patch diff --git a/packages/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch b/packages/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch index 27ab0a306..8a570e2ae 100644 --- a/packages/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch +++ b/packages/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch @@ -1,6 +1,6 @@ --- charts-original/Chart.yaml +++ charts/Chart.yaml -@@ -1,8 +1,14 @@ +@@ -1,7 +1,13 @@ +annotations: + catalog.rancher.io/certified: rancher + catalog.rancher.io/namespace: cattle-monitoring-system @@ -11,9 +11,7 @@ appVersion: 1.1.2 description: A Helm chart for prometheus node-exporter -name: prometheus-node-exporter --version: 1.16.2 +name: rancher-node-exporter -+version: 1.18.1 + version: 1.18.1 home: https://github.com/prometheus/node_exporter/ sources: - - https://github.com/prometheus/node_exporter/ diff --git a/packages/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch b/packages/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch index fa5800969..c2844c29c 100644 --- a/packages/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch +++ b/packages/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch @@ -1,13 +1,7 @@ --- charts-original/templates/daemonset.yaml +++ charts/templates/daemonset.yaml -@@ -29,9 +29,13 @@ - {{- if .Values.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName }} - {{- end }} -+ {{- if .Values.extraInitContainers }} -+ initContainers: -+ {{ toYaml .Values.extraInitContainers | nindent 6 }} -+ {{- end }} +@@ -35,7 +35,7 @@ + {{- end }} containers: - name: node-exporter - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" @@ -15,7 +9,7 @@ imagePullPolicy: {{ .Values.image.pullPolicy }} args: - --path.procfs=/host/proc -@@ -129,18 +133,18 @@ +@@ -133,18 +133,18 @@ affinity: {{ toYaml .Values.affinity | indent 8 }} {{- end }} diff --git a/packages/rancher-node-exporter/generated-changes/patch/templates/psp.yaml.patch b/packages/rancher-node-exporter/generated-changes/patch/templates/psp.yaml.patch deleted file mode 100644 index 21ae32226..000000000 --- a/packages/rancher-node-exporter/generated-changes/patch/templates/psp.yaml.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- charts-original/templates/psp.yaml -+++ charts/templates/psp.yaml -@@ -6,6 +6,10 @@ - name: {{ template "prometheus-node-exporter.fullname" . }} - namespace: {{ template "prometheus-node-exporter.namespace" . }} - labels: {{ include "prometheus-node-exporter.labels" . | indent 4 }} -+{{- if .Values.rbac.pspAnnotations }} -+ annotations: -+{{ toYaml .Values.rbac.pspAnnotations | indent 4 }} -+{{- end}} - spec: - privileged: false - # Required to prevent escalations to root. diff --git a/packages/rancher-node-exporter/generated-changes/patch/values.yaml.patch b/packages/rancher-node-exporter/generated-changes/patch/values.yaml.patch index 78e8588e9..af47a4e7a 100644 --- a/packages/rancher-node-exporter/generated-changes/patch/values.yaml.patch +++ b/packages/rancher-node-exporter/generated-changes/patch/values.yaml.patch @@ -15,15 +15,7 @@ tag: v1.1.2 pullPolicy: IfNotPresent -@@ -72,6 +77,7 @@ - ## If true, create & use Pod Security Policy resources - ## https://kubernetes.io/docs/concepts/policy/pod-security-policy/ - pspEnabled: true -+ pspAnnotations: {} - - # for deployments that have node_exporter deployed outside of the cluster, list - # their addresses here -@@ -125,6 +131,8 @@ +@@ -126,6 +131,8 @@ tolerations: - effect: NoSchedule operator: Exists @@ -32,11 +24,3 @@ ## Assign a PriorityClassName to pods if set # priorityClassName: "" -@@ -168,3 +176,7 @@ - ## - name: collector-textfiles - ## mountPath: /run/prometheus - ## readOnly: false -+ -+## Additional InitContainers to initialize the pod -+## -+extraInitContainers: [] diff --git a/packages/rancher-node-exporter/package.yaml b/packages/rancher-node-exporter/package.yaml index bad0a763e..ab4afc92a 100644 --- a/packages/rancher-node-exporter/package.yaml +++ b/packages/rancher-node-exporter/package.yaml @@ -1,4 +1,4 @@ url: https://github.com/prometheus-community/helm-charts.git subdirectory: charts/prometheus-node-exporter -commit: 78d1219306eaca5be1d8bab84445d0489e073840 +commit: a05f7b8888d6174827b815aa097d64b94f00af3e version: 100.0.0