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

rancher monitoring handle cattle system_default_registry for airgapped environments 

Signed-off-by: Alexandre Lamarre <alexandre.lamarre@suse.com>

reintroduce default registry docker.io

since upstream expects it to be set

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

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

@ -0,0 +1,11 @@
--- charts-original/charts/prometheus-node-exporter/values.yaml
+++ charts/charts/prometheus-node-exporter/values.yaml
@@ -35,7 +35,7 @@
imagePullSecrets: []
#
# Allow parent charts to override registry hostname
- imageRegistry: ""
+ imageRegistry: "docker.io"
# Configure kube-rbac-proxy. When enabled, creates a kube-rbac-proxy to protect the node-exporter http endpoint.
# The requests are served through the same service but requests are HTTPS.

11
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/_helpers.tpl.patch
View File

@ -1,6 +1,6 @@
--- charts-original/templates/_helpers.tpl
+++ charts/templates/_helpers.tpl
@@ -1,3 +1,138 @@
@@ -1,3 +1,147 @@
+# Rancher
+{{- define "system_default_registry" -}}
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
@ -8,6 +8,15 @@
+{{- end -}}
+{{- end -}}
+
+{{- define "monitoring_registry" -}}
+ {{- $temp_registry := (include "system_default_registry" .) -}}
+ {{- if $temp_registry -}}
+ {{- trimSuffix "/" $temp_registry -}}
+ {{- else -}}
+ {{- .Values.global.imageRegistry -}}
+ {{- end -}}
+{{- end -}}
+
+{{/*
+https://github.com/helm/helm/issues/4535#issuecomment-477778391
+Usage: {{ include "call-nested" (list . "SUBCHART_NAME" "TEMPLATE") }}

9
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/alertmanager/alertmanager.yaml.patch
View File

@ -1,5 +1,14 @@
--- charts-original/templates/alertmanager/alertmanager.yaml
+++ charts/templates/alertmanager/alertmanager.yaml
@@ -13,7 +13,7 @@
{{- end }}
spec:
{{- if .Values.alertmanager.alertmanagerSpec.image }}
- {{- $registry := .Values.global.imageRegistry | default .Values.alertmanager.alertmanagerSpec.image.registry -}}
+ {{- $registry := include "monitoring_registry" . | default .Values.alertmanager.alertmanagerSpec.image.registry }}
{{- if and .Values.alertmanager.alertmanagerSpec.image.tag .Values.alertmanager.alertmanagerSpec.image.sha }}
image: "{{ $registry }}/{{ .Values.alertmanager.alertmanagerSpec.image.repository }}:{{ .Values.alertmanager.alertmanagerSpec.image.tag }}@sha256:{{ .Values.alertmanager.alertmanagerSpec.image.sha }}"
{{- else if .Values.alertmanager.alertmanagerSpec.image.sha }}
@@ -35,11 +35,13 @@
externalUrl: "{{ tpl .Values.alertmanager.alertmanagerSpec.externalUrl . }}"
{{- else if and .Values.alertmanager.ingress.enabled .Values.alertmanager.ingress.hosts }}

9
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml.patch
View File

@ -1,5 +1,14 @@
--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
+++ charts/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml
@@ -34,7 +34,7 @@
{{- end }}
containers:
- name: create
- {{- $registry := .Values.global.imageRegistry | default .Values.prometheusOperator.admissionWebhooks.patch.image.registry -}}
+ {{- $registry := include "monitoring_registry" . | default .Values.prometheusOperator.admissionWebhooks.patch.image.registry -}}
{{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}
image: {{ $registry }}/{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}
{{- else }}
@@ -54,16 +54,16 @@
{{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }}
restartPolicy: OnFailure

9
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml.patch
View File

@ -1,5 +1,14 @@
--- charts-original/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
+++ charts/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml
@@ -34,7 +34,7 @@
{{- end }}
containers:
- name: patch
- {{- $registry := .Values.global.imageRegistry | default .Values.prometheusOperator.admissionWebhooks.patch.image.registry -}}
+ {{- $registry := include "monitoring_registry" . | default .Values.prometheusOperator.admissionWebhooks.patch.image.registry -}}
{{- if .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}
image: {{ $registry }}/{{ .Values.prometheusOperator.admissionWebhooks.patch.image.repository }}:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.tag }}@sha256:{{ .Values.prometheusOperator.admissionWebhooks.patch.image.sha }}
{{- else }}
@@ -55,16 +55,16 @@
{{ toYaml .Values.prometheusOperator.admissionWebhooks.patch.resources | indent 12 }}
restartPolicy: OnFailure

9
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/prometheus/prometheus.yaml.patch
View File

@ -1,5 +1,14 @@
--- charts-original/templates/prometheus/prometheus.yaml
+++ charts/templates/prometheus/prometheus.yaml
@@ -32,7 +32,7 @@
{{ toYaml .Values.prometheus.prometheusSpec.apiserverConfig | indent 4}}
{{- end }}
{{- if .Values.prometheus.prometheusSpec.image }}
- {{- $registry := .Values.global.imageRegistry | default .Values.prometheus.prometheusSpec.image.registry -}}
+ {{- $registry := include "monitoring_registry" . | default .Values.prometheus.prometheusSpec.image.registry -}}
{{- if and .Values.prometheus.prometheusSpec.image.tag .Values.prometheus.prometheusSpec.image.sha }}
image: "{{ $registry }}/{{ .Values.prometheus.prometheusSpec.image.repository }}:{{ .Values.prometheus.prometheusSpec.image.tag }}@sha256:{{ .Values.prometheus.prometheusSpec.image.sha }}"
{{- else if .Values.prometheus.prometheusSpec.image.sha }}
@@ -69,11 +69,13 @@
externalUrl: "{{ tpl .Values.prometheus.prometheusSpec.externalUrl . }}"
{{- else if and .Values.prometheus.ingress.enabled .Values.prometheus.ingress.hosts }}

9
packages/rancher-monitoring/rancher-monitoring/generated-changes/patch/templates/thanos-ruler/ruler.yaml.patch
View File

@ -1,5 +1,14 @@
--- charts-original/templates/thanos-ruler/ruler.yaml
+++ charts/templates/thanos-ruler/ruler.yaml
@@ -13,7 +13,7 @@
{{- end }}
spec:
{{- if .Values.thanosRuler.thanosRulerSpec.image }}
- {{- $registry := .Values.global.imageRegistry | default .Values.thanosRuler.thanosRulerSpec.image.registry -}}
+ {{- $registry := include "monitoring_registry" . | default .Values.thanosRuler.thanosRulerSpec.image.registry -}}
{{- if and .Values.thanosRuler.thanosRulerSpec.image.tag .Values.thanosRuler.thanosRulerSpec.image.sha }}
image: "{{ $registry }}/{{ .Values.thanosRuler.thanosRulerSpec.image.repository }}:{{ .Values.thanosRuler.thanosRulerSpec.image.tag }}@sha256:{{ .Values.thanosRuler.thanosRulerSpec.image.sha }}"
{{- else if .Values.thanosRuler.thanosRulerSpec.image.sha }}
@@ -37,8 +37,8 @@
{{- else }}
externalPrefix: http://{{ template "kube-prometheus-stack.thanosRuler.name" . }}.{{ template "kube-prometheus-stack.namespace" . }}:{{ .Values.thanosRuler.service.port }}