From 865dc705f8143675beaa1b9a2ee076a7d53f4188 Mon Sep 17 00:00:00 2001 From: Alexandre Lamarre Date: Mon, 15 Jan 2024 12:41:03 -0500 Subject: [PATCH] patch rancher-monitoring/kube-state-metrics image registries Signed-off-by: Alexandre Lamarre patch rancher-monitoring kube RBAC proxy image registries Signed-off-by: Alexandre Lamarre patch rancher-monitoring rbac-proxy node-exporter,prometheus operator image registries Signed-off-by: Alexandre Lamarre --- .../templates/_helpers.tpl.patch | 60 +++++++++++++++++++ .../templates/daemonset.yaml.patch | 14 +++++ .../prometheus-operator/deployment.yaml.patch | 29 ++++++++- 3 files changed, 102 insertions(+), 1 deletion(-) create mode 100644 packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/kube-state-metrics/templates/_helpers.tpl.patch diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/kube-state-metrics/templates/_helpers.tpl.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/kube-state-metrics/templates/_helpers.tpl.patch new file mode 100644 index 000000000..5aeab47fd --- /dev/null +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/kube-state-metrics/templates/_helpers.tpl.patch @@ -0,0 +1,60 @@ +--- charts-original/charts/kube-state-metrics/templates/_helpers.tpl ++++ charts/charts/kube-state-metrics/templates/_helpers.tpl +@@ -5,6 +5,15 @@ + {{- end -}} + {{- end -}} + ++{{- define "monitoring_registry" -}} ++ {{- $temp_registry := (include "system_default_registry" .) -}} ++ {{- if $temp_registry -}} ++ {{- trimSuffix "/" $temp_registry -}} ++ {{- else -}} ++ {{- .Values.global.imageRegistry -}} ++ {{- end -}} ++{{- end -}} ++ + # Windows Support + + {{/* +@@ -150,15 +159,16 @@ + The image to use for kube-state-metrics + */}} + {{- define "kube-state-metrics.image" -}} ++{{- $registry := (include "monitoring_registry" .) }} + {{- if .Values.image.sha }} +-{{- 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.sha }} ++{{- if $registry }} ++{{- printf "%s/%s:%s@%s" $registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }} + {{- else }} + {{- printf "%s/%s:%s@%s" .Values.image.registry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) .Values.image.sha }} + {{- end }} + {{- else }} +-{{- if .Values.global.imageRegistry }} +-{{- printf "%s/%s:%s" .Values.global.imageRegistry .Values.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.image.tag) }} ++{{- if $registry }} ++{{- printf "%s/%s:%s" $registry .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) }} + {{- end }} +@@ -169,15 +179,16 @@ + The image to use for kubeRBACProxy + */}} + {{- define "kubeRBACProxy.image" -}} ++{{- $registry := (include "monitoring_registry" .) }} + {{- if .Values.kubeRBACProxy.image.sha }} +-{{- if .Values.global.imageRegistry }} +-{{- printf "%s/%s:%s@%s" .Values.global.imageRegistry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) .Values.kubeRBACProxy.image.sha }} ++{{- if $registry }} ++{{- printf "%s/%s:%s@%s" $registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) .Values.kubeRBACProxy.image.sha }} + {{- else }} + {{- printf "%s/%s:%s@%s" .Values.kubeRBACProxy.image.registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) .Values.kubeRBACProxy.image.sha }} + {{- end }} + {{- else }} +-{{- if .Values.global.imageRegistry }} +-{{- printf "%s/%s:%s" .Values.global.imageRegistry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) }} ++{{- if $registry }} ++{{- printf "%s/%s:%s" $registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) }} + {{- else }} + {{- printf "%s/%s:%s" .Values.kubeRBACProxy.image.registry .Values.kubeRBACProxy.image.repository (default (printf "v%s" .Chart.AppVersion) .Values.kubeRBACProxy.image.tag) }} + {{- end }} diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/daemonset.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/daemonset.yaml.patch index 46d3edd02..b0883da64 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/daemonset.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/charts/prometheus-node-exporter/templates/daemonset.yaml.patch @@ -9,3 +9,17 @@ imagePullPolicy: {{ .Values.image.pullPolicy }} args: - --path.procfs=/host/proc +@@ -192,10 +192,11 @@ + - name: kube-rbac-proxy-config + mountPath: /etc/kube-rbac-proxy-config + imagePullPolicy: {{ .Values.kubeRBACProxy.image.pullPolicy }} ++ {{- $base_registry := (include "monitoring_registry" .) }} + {{- if .Values.kubeRBACProxy.image.sha }} +- image: "{{ .Values.global.imageRegistry | default .Values.kubeRBACProxy.image.registry}}/{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}@sha256:{{ .Values.kubeRBACProxy.image.sha }}" ++ image: "{{ $base_registry | default .Values.kubeRBACProxy.image.registry}}/{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}@sha256:{{ .Values.kubeRBACProxy.image.sha }}" + {{- else }} +- image: "{{ .Values.global.imageRegistry | default .Values.kubeRBACProxy.image.registry}}/{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}" ++ image: "{{ $base_registry | default .Values.kubeRBACProxy.image.registry}}/{{ .Values.kubeRBACProxy.image.repository }}:{{ .Values.kubeRBACProxy.image.tag }}" + {{- end }} + ports: + - containerPort: {{ .Values.service.port}} diff --git a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch index fccf1d96d..72f1d23b4 100644 --- a/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch +++ b/packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/deployment.yaml.patch @@ -1,6 +1,33 @@ --- charts-original/templates/prometheus-operator/deployment.yaml +++ charts/templates/prometheus-operator/deployment.yaml -@@ -167,16 +167,16 @@ +@@ -40,9 +40,10 @@ + {{- end }} + containers: + - name: {{ template "kube-prometheus-stack.name" . }} +- {{- $configReloaderRegistry := .Values.global.imageRegistry | default .Values.prometheusOperator.prometheusConfigReloader.image.registry -}} +- {{- $operatorRegistry := .Values.global.imageRegistry | default .Values.prometheusOperator.image.registry -}} +- {{- $thanosRegistry := .Values.global.imageRegistry | default .Values.prometheusOperator.thanosImage.registry -}} ++ {{- $base_registry := (include "monitoring_registry" .) }} ++ {{- $configReloaderRegistry := $base_registry | default .Values.prometheusOperator.prometheusConfigReloader.image.registry -}} ++ {{- $operatorRegistry := $base_registry | default .Values.prometheusOperator.image.registry -}} ++ {{- $thanosRegistry := $base_registry | default .Values.prometheusOperator.thanosImage.registry -}} + {{- if .Values.prometheusOperator.image.sha }} + image: "{{ $operatorRegistry }}/{{ .Values.prometheusOperator.image.repository }}:{{ .Values.prometheusOperator.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.prometheusOperator.image.sha }}" + {{- else }} +@@ -76,10 +77,10 @@ + {{- end }} + - --localhost=127.0.0.1 + {{- if .Values.prometheusOperator.prometheusDefaultBaseImage }} +- - --prometheus-default-base-image={{ .Values.global.imageRegistry | default .Values.prometheusOperator.prometheusDefaultBaseImageRegistry }}/{{ .Values.prometheusOperator.prometheusDefaultBaseImage }} ++ - --prometheus-default-base-image={{ $base_registry | default .Values.prometheusOperator.prometheusDefaultBaseImageRegistry }}/{{ .Values.prometheusOperator.prometheusDefaultBaseImage }} + {{- end }} + {{- if .Values.prometheusOperator.alertmanagerDefaultBaseImage }} +- - --alertmanager-default-base-image={{ .Values.global.imageRegistry | default .Values.prometheusOperator.alertmanagerDefaultBaseImageRegistry }}/{{ .Values.prometheusOperator.alertmanagerDefaultBaseImage }} ++ - --alertmanager-default-base-image={{ $base_registry | default .Values.prometheusOperator.alertmanagerDefaultBaseImageRegistry }}/{{ .Values.prometheusOperator.alertmanagerDefaultBaseImage }} + {{- end }} + {{- if .Values.prometheusOperator.prometheusConfigReloader.image.sha }} + - --prometheus-config-reloader={{ $configReloaderRegistry }}/{{ .Values.prometheusOperator.prometheusConfigReloader.image.repository }}:{{ .Values.prometheusOperator.prometheusConfigReloader.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.prometheusOperator.prometheusConfigReloader.image.sha }} +@@ -167,16 +168,16 @@ hostNetwork: true dnsPolicy: ClusterFirstWithHostNet {{- end }}