mirror of https://git.rancher.io/charts
125 lines
7.0 KiB
Diff
125 lines
7.0 KiB
Diff
--- charts-original/templates/_pod.tpl
|
|
+++ charts/templates/_pod.tpl
|
|
@@ -21,9 +21,9 @@
|
|
{{- if ( and .Values.persistence.enabled .Values.initChownData.enabled ) }}
|
|
- name: init-chown-data
|
|
{{- if .Values.initChownData.image.sha }}
|
|
- image: "{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}@sha256:{{ .Values.initChownData.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}@sha256:{{ .Values.initChownData.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.initChownData.image.repository }}:{{ .Values.initChownData.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.initChownData.image.pullPolicy }}
|
|
securityContext:
|
|
@@ -44,9 +44,9 @@
|
|
{{- if .Values.dashboards }}
|
|
- name: download-dashboards
|
|
{{- if .Values.downloadDashboardsImage.sha }}
|
|
- image: "{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}@sha256:{{ .Values.downloadDashboardsImage.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}@sha256:{{ .Values.downloadDashboardsImage.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.downloadDashboardsImage.repository }}:{{ .Values.downloadDashboardsImage.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.downloadDashboardsImage.pullPolicy }}
|
|
command: ["/bin/sh"]
|
|
@@ -87,9 +87,9 @@
|
|
{{- if and .Values.sidecar.datasources.enabled .Values.sidecar.datasources.initDatasources }}
|
|
- name: {{ template "grafana.name" . }}-init-sc-datasources
|
|
{{- if .Values.sidecar.image.sha }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
|
|
env:
|
|
@@ -144,9 +144,9 @@
|
|
{{- if .Values.sidecar.notifiers.enabled }}
|
|
- name: {{ template "grafana.name" . }}-sc-notifiers
|
|
{{- if .Values.sidecar.image.sha }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
|
|
env:
|
|
@@ -223,9 +223,9 @@
|
|
{{- if .Values.sidecar.dashboards.enabled }}
|
|
- name: {{ template "grafana.name" . }}-sc-dashboard
|
|
{{- if .Values.sidecar.image.sha }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
|
|
env:
|
|
@@ -313,9 +313,9 @@
|
|
{{- if .Values.sidecar.datasources.enabled }}
|
|
- name: {{ template "grafana.name" . }}-sc-datasources
|
|
{{- if .Values.sidecar.image.sha }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
|
|
env:
|
|
@@ -416,9 +416,9 @@
|
|
{{- if .Values.sidecar.plugins.enabled }}
|
|
- name: {{ template "grafana.name" . }}-sc-plugins
|
|
{{- if .Values.sidecar.image.sha }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}@sha256:{{ .Values.sidecar.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.sidecar.image.repository }}:{{ .Values.sidecar.image.tag }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.sidecar.imagePullPolicy }}
|
|
env:
|
|
@@ -518,9 +518,9 @@
|
|
{{- end}}
|
|
- name: {{ .Chart.Name }}
|
|
{{- if .Values.image.sha }}
|
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}@sha256:{{ .Values.image.sha }}"
|
|
{{- else }}
|
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
|
+ image: "{{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
|
{{- end }}
|
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
|
{{- if .Values.command }}
|
|
@@ -736,9 +736,9 @@
|
|
{{- with .Values.extraContainers }}
|
|
{{ tpl . $ | indent 2 }}
|
|
{{- end }}
|
|
-{{- with .Values.nodeSelector }}
|
|
-nodeSelector:
|
|
- {{- toYaml . | nindent 2 }}
|
|
+nodeSelector: {{ include "linux-node-selector" . | nindent 2 }}
|
|
+{{- if .Values.nodeSelector }}
|
|
+{{ toYaml .Values.nodeSelector | indent 2 }}
|
|
{{- end }}
|
|
{{- $root := . }}
|
|
{{- with .Values.affinity }}
|
|
@@ -749,9 +749,9 @@
|
|
topologySpreadConstraints:
|
|
{{- toYaml . | nindent 2 }}
|
|
{{- end }}
|
|
-{{- with .Values.tolerations }}
|
|
-tolerations:
|
|
- {{- toYaml . | nindent 2 }}
|
|
+tolerations: {{ include "linux-node-tolerations" . | nindent 2 }}
|
|
+{{- if .Values.tolerations }}
|
|
+{{ toYaml .Values.tolerations | indent 2 }}
|
|
{{- end }}
|
|
volumes:
|
|
- name: config
|