Update rancher-monitoring/rancher-node-exporter to new base 766bdf70d…

…d19d4ddc80b0a4a7e785bf85b405c05
rancher · Sep 22, 2023 · d9ae49f · d9ae49f
1 parent 06d3dd0
commit d9ae49f
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 40 deletions.
diff --git a/packages/rancher-monitoring/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch b/packages/rancher-monitoring/rancher-node-exporter/generated-changes/patch/Chart.yaml.patch
@@ -1,22 +1,33 @@
 --- charts-original/Chart.yaml
 +++ charts/Chart.yaml
-@@ -1,3 +1,10 @@
-+annotations:
+@@ -1,10 +1,12 @@
+ annotations:
+-  artifacthub.io/license: Apache-2.0
+-  artifacthub.io/links: |
+-    - name: Chart Source
+-      url: https://github.com/prometheus-community/helm-charts
 +  catalog.cattle.io/hidden: "true"
 +  catalog.cattle.io/kube-version: '>= 1.16.0-0 < 1.27.0-0'
 +  catalog.cattle.io/os: linux
 +  catalog.rancher.io/certified: rancher
 +  catalog.rancher.io/namespace: cattle-monitoring-system
 +  catalog.rancher.io/release-name: rancher-node-exporter
  apiVersion: v2
- appVersion: 1.3.1
+-appVersion: 1.6.0
++appVersion: 1.3.1
  description: A Helm chart for prometheus node-exporter
-@@ -11,7 +18,7 @@
+ home: https://github.com/prometheus/node_exporter/
+ keywords:
+@@ -16,10 +18,8 @@
    name: gianrubio
  - email: zanhsieh@gmail.com
    name: zanhsieh
+-- email: rootsandtrees@posteo.de
+-  name: zeritti
 -name: prometheus-node-exporter
 +name: rancher-node-exporter
  sources:
  - https://github.com/prometheus/node_exporter/
  type: application
+-version: 4.20.0
++version: 4.2.0
diff --git a/...ancher-monitoring/rancher-node-exporter/generated-changes/patch/templates/NOTES.txt.patch b/...ancher-monitoring/rancher-node-exporter/generated-changes/patch/templates/NOTES.txt.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/NOTES.txt
 +++ charts/templates/NOTES.txt
-@@ -10,6 +10,6 @@
+@@ -10,8 +10,8 @@
    echo http://$SERVICE_IP:{{ .Values.service.port }}
  {{- else if contains "ClusterIP" .Values.service.type }}
    export POD_NAME=$(kubectl get pods --namespace {{ template "prometheus-node-exporter.namespace" . }} -l "app.kubernetes.io/name={{ template "prometheus-node-exporter.name" . }},app.kubernetes.io/instance={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
@@ -9,3 +9,5 @@
 +  echo "Visit http://127.0.0.1:{{ .Values.service.port }} to use your application"
 +  kubectl port-forward --namespace {{ template "prometheus-node-exporter.namespace" . }} $POD_NAME {{ .Values.service.port }}
  {{- end }}
+
+ {{- if .Values.kubeRBACProxy.enabled}}
diff --git a/...r-monitoring/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch b/...r-monitoring/rancher-node-exporter/generated-changes/patch/templates/daemonset.yaml.patch
@@ -1,32 +1,11 @@
 --- charts-original/templates/daemonset.yaml
 +++ charts/templates/daemonset.yaml
-@@ -35,7 +35,7 @@
-       {{- end }}
+@@ -42,7 +42,7 @@
        containers:
+         {{- $servicePort := ternary 8100 .Values.service.port .Values.kubeRBACProxy.enabled }}
          - name: node-exporter
 -          image: {{ include "prometheus-node-exporter.image" . }}
 +          image: {{ template "system_default_registry" . }}{{ include "prometheus-node-exporter.image" . }}
            imagePullPolicy: {{ .Values.image.pullPolicy }}
            args:
              - --path.procfs=/host/proc
-@@ -177,14 +177,14 @@
-       dnsConfig:
- {{ toYaml . | indent 8 }}
- {{- end }}
-+      nodeSelector: {{ include "linux-node-selector" . | nindent 8 }}
- {{- if .Values.nodeSelector }}
--      nodeSelector:
--{{ toYaml .Values.nodeSelector | indent 8 }}
-+{{- toYaml .Values.nodeSelector | nindent 8 }}
- {{- end }}
--    {{- with .Values.tolerations }}
--      tolerations:
--{{ toYaml . | indent 8 }}
--    {{- end }}
-+      tolerations: {{ include "linux-node-tolerations" . | nindent 8 }}
-+{{- if .Values.tolerations }}
-+{{- toYaml .Values.tolerations | nindent 8 }}
-+{{- end }}
-       volumes:
-         - name: proc
-           hostPath:
diff --git a/...r-monitoring/rancher-node-exporter/generated-changes/patch/templates/endpoints.yaml.patch b/...r-monitoring/rancher-node-exporter/generated-changes/patch/templates/endpoints.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/templates/endpoints.yaml
 +++ charts/templates/endpoints.yaml
-@@ -12,6 +12,6 @@
+@@ -13,6 +13,6 @@
        {{- end }}
      ports:
        - name: {{ .Values.service.portName }}

diff --git a/...itoring/rancher-node-exporter/generated-changes/patch/templates/servicemonitor.yaml.patch b/...itoring/rancher-node-exporter/generated-changes/patch/templates/servicemonitor.yaml.patch
@@ -1,13 +1,14 @@
 --- charts-original/templates/servicemonitor.yaml
 +++ charts/templates/servicemonitor.yaml
-@@ -44,8 +44,18 @@
+@@ -53,9 +53,19 @@
+       {{- with .Values.prometheus.monitor.relabelings }}
        relabelings:
          {{- toYaml . | nindent 8 }}
-     {{- end }}
--    {{- with .Values.prometheus.monitor.metricRelabelings }}
+-      {{- end }}
+-      {{- with .Values.prometheus.monitor.metricRelabelings }}
++    {{- end }}
        metricRelabelings:
 -        {{- toYaml . | nindent 8 }}
--    {{- end }}
 +        {{- with .Values.prometheus.monitor.metricRelabelings }}
 +          {{- toYaml . | nindent 8 }}
 +        {{- end }}
@@ -20,5 +21,5 @@
 +        - sourceLabels: [__address__]
 +          targetLabel: cluster_name
 +          replacement: {{ .Values.global.cattle.clusterName }}
-+      {{- end }}
+       {{- end }}
  {{- end }}
diff --git a/packages/rancher-monitoring/rancher-node-exporter/generated-changes/patch/values.yaml.patch b/packages/rancher-monitoring/rancher-node-exporter/generated-changes/patch/values.yaml.patch
@@ -1,6 +1,6 @@
 --- charts-original/values.yaml
 +++ charts/values.yaml
-@@ -1,10 +1,17 @@
+@@ -1,11 +1,11 @@
  # Default values for prometheus-node-exporter.
  # This is a YAML-formatted file.
  # Declare variables to be passed into your templates.
@@ -12,15 +12,28 @@
 +    systemDefaultRegistry: ""
 +
  image:
--  repository: quay.io/prometheus/node-exporter
+-  registry: quay.io
+-  repository: prometheus/node-exporter
 +  repository: rancher/mirrored-prometheus-node-exporter
    # Overrides the image tag whose default is {{ printf "v%s" .Chart.AppVersion }}
 -  tag: ""
 +  tag: v1.3.1
    pullPolicy: IfNotPresent
-   sha: ""
+   digest: ""
 
-@@ -13,8 +20,8 @@
+@@ -15,6 +15,11 @@
+ fullnameOverride: ""
+
+ global:
++  cattle:
++    psp:
++      enabled: false
++    systemDefaultRegistry: ""
++
+   # To help compatibility with other charts which use global.imagePullSecrets.
+   # Allow either an array of {name: pullSecret} maps (k8s-style), or an array of strings (more common helm-style).
+   # global:
+@@ -66,8 +71,8 @@
 
  service:
    type: ClusterIP
@@ -31,7 +44,7 @@
    nodePort:
    portName: metrics
    listenOnAllInterfaces: true
-@@ -95,9 +102,6 @@
+@@ -276,9 +281,6 @@
    ## If true, create & use RBAC resources
    ##
    create: true
@@ -41,7 +54,7 @@
    pspAnnotations: {}
 
  # for deployments that have node_exporter deployed outside of the cluster, list
-@@ -164,6 +168,8 @@
+@@ -348,6 +350,8 @@
  tolerations:
    - effect: NoSchedule
      operator: Exists