mirror of https://git.rancher.io/charts
use cattle system registry (#613)
parent
ec3161501e
commit
0e21736bed
Binary file not shown.
Binary file not shown.
|
@ -24,8 +24,8 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templa
|
|||
{{- end -}}
|
||||
+
|
||||
+{{- define "system_default_registry" -}}
|
||||
+{{- if .Values.global.systemDefaultRegistry -}}
|
||||
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
|
||||
+{{- if .Values.global.cattle.systemDefaultRegistry -}}
|
||||
+{{- printf "%s/" .Values.global.cattle.systemDefaultRegistry -}}
|
||||
+{{- else -}}
|
||||
+{{- "" -}}
|
||||
+{{- end -}}
|
||||
|
@ -51,7 +51,7 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
|
|||
|
||||
resources: {}
|
||||
# We usually recommend not to specify default resources and to leave this as a conscious
|
||||
@@ -76,4 +76,32 @@
|
||||
@@ -76,4 +76,35 @@
|
||||
monitoring:
|
||||
# Create a Prometheus Operator ServiceMonitor object
|
||||
serviceMonitor:
|
||||
|
@ -87,4 +87,6 @@ diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values
|
|||
+ tag: 0.1.0
|
||||
+
|
||||
+global:
|
||||
+ systemDefaultRegistry: ""
|
||||
+ cattle:
|
||||
+ systemDefaultRegistry: ""
|
||||
\ No newline at end of file
|
||||
|
|
Loading…
Reference in New Issue