andata
/
rancher-charts
mirror of https://git.rancher.io/charts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update registry handling for prometheus node exporter 

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>
pull/3356/head
Alexandre Lamarre 2024-01-12 16:10:17 -05:00 committed by Lucas Lopes
parent 718ccaaa4f
commit e3f8a773cb
2 changed files with 37 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/_helpers.tpl.patch Normal file
View File

@ -0,0 +1,26 @@
--- charts-original/charts/prometheus-node-exporter/templates/_helpers.tpl
+++ charts/charts/prometheus-node-exporter/templates/_helpers.tpl
@@ -104,16 +104,21 @@
The image to use
*/}}
{{- define "prometheus-node-exporter.image" -}}
+{{- $temp_registry := (include "system_default_registry" .) }}
{{- if .Values.image.sha }}
{{- fail "image.sha forbidden. Use image.digest instead" }}
{{- else if .Values.image.digest }}
-{{- if .Values.global.imageRegistry }}
+{{- if $temp_registry }}
+{{- printf "%s%s:%s@%s" $temp_registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.digest }}
+{{- else if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s@%s" .Values.global.imageRegistry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.digest }}
{{- else }}
{{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.digest }}
{{- end }}
{{- else }}
-{{- if .Values.global.imageRegistry }}
+{{- if $temp_registry }}
+{{- printf "%s%s:%s" $temp_registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}
+{{- else if .Values.global.imageRegistry }}
{{- printf "%s/%s:%s" .Values.global.imageRegistry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}
{{- else }}
{{- printf "%s/%s:%s" .Values.image.registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }}

11
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/daemonset.yaml.patch Normal file
View File

@ -0,0 +1,11 @@
--- charts-original/charts/prometheus-node-exporter/templates/daemonset.yaml
+++ charts/charts/prometheus-node-exporter/templates/daemonset.yaml
@@ -42,7 +42,7 @@
containers:
{{- $servicePort := ternary 8100 .Values.service.port .Values.kubeRBACProxy.enabled }}
- name: node-exporter
- image: {{ template "system_default_registry" . }}{{ include "prometheus-node-exporter.image" . }}
+ image: {{ include "prometheus-node-exporter.image" . }}
imagePullPolicy: {{ .Values.image.pullPolicy }}
args:
- --path.procfs=/host/proc