mirror of https://git.rancher.io/rke2-charts
67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/Chart.yaml packages/rke2-metrics-server/charts/Chart.yaml
|
|
--- packages/rke2-metrics-server/charts-original/Chart.yaml
|
|
+++ packages/rke2-metrics-server/charts/Chart.yaml
|
|
@@ -9,7 +9,7 @@
|
|
name: olemarkus
|
|
- email: k.aasan@sportradar.com
|
|
name: kennethaasan
|
|
-name: metrics-server
|
|
+name: rke2-metrics-server
|
|
sources:
|
|
- https://github.com/kubernetes-incubator/metrics-server
|
|
version: 2.11.1
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/templates/_helpers.tpl packages/rke2-metrics-server/charts/templates/_helpers.tpl
|
|
--- packages/rke2-metrics-server/charts-original/templates/_helpers.tpl
|
|
+++ packages/rke2-metrics-server/charts/templates/_helpers.tpl
|
|
@@ -49,3 +49,11 @@
|
|
{{ default "default" .Values.serviceAccount.name }}
|
|
{{- end -}}
|
|
{{- end -}}
|
|
+
|
|
+{{- define "system_default_registry" -}}
|
|
+{{- if .Values.global.systemDefaultRegistry -}}
|
|
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
|
|
+{{- else -}}
|
|
+{{- "" -}}
|
|
+{{- end -}}
|
|
+{{- end -}}
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/templates/metrics-server-deployment.yaml packages/rke2-metrics-server/charts/templates/metrics-server-deployment.yaml
|
|
--- packages/rke2-metrics-server/charts-original/templates/metrics-server-deployment.yaml
|
|
+++ packages/rke2-metrics-server/charts/templates/metrics-server-deployment.yaml
|
|
@@ -47,7 +47,7 @@
|
|
{{- ( tpl (toYaml .Values.extraContainers) . ) | nindent 8 }}
|
|
{{- end }}
|
|
- name: metrics-server
|
|
- image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
|
|
+ image: {{ template "system_default_registry" . }}{{ .Values.image.repository }}:{{ .Values.image.tag }}
|
|
imagePullPolicy: {{ .Values.image.pullPolicy }}
|
|
command:
|
|
- /metrics-server
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rke2-metrics-server/charts-original/values.yaml packages/rke2-metrics-server/charts/values.yaml
|
|
--- packages/rke2-metrics-server/charts-original/values.yaml
|
|
+++ packages/rke2-metrics-server/charts/values.yaml
|
|
@@ -27,7 +27,7 @@
|
|
enabled: false
|
|
|
|
image:
|
|
- repository: k8s.gcr.io/metrics-server-amd64
|
|
+ repository: rancher/k8s-metrics-server
|
|
tag: v0.3.6
|
|
pullPolicy: IfNotPresent
|
|
|
|
@@ -37,6 +37,7 @@
|
|
args: []
|
|
# enable this if you have self-signed certificates, see: https://github.com/kubernetes-incubator/metrics-server
|
|
# - --kubelet-insecure-tls
|
|
+ - --kubelet-preferred-address-types=InternalIP
|
|
|
|
resources: {}
|
|
|
|
@@ -107,3 +108,6 @@
|
|
enabled: false
|
|
minAvailable:
|
|
maxUnavailable:
|
|
+
|
|
+global:
|
|
+ systemDefaultRegistry: ""
|