diff --git a/assets/rancher-logging/rancher-logging-3.4.000.tgz b/assets/rancher-logging/rancher-logging-3.4.000.tgz deleted file mode 100644 index 3c4ace6b7..000000000 Binary files a/assets/rancher-logging/rancher-logging-3.4.000.tgz and /dev/null differ diff --git a/assets/rancher-logging/rancher-logging-crd-3.4.000.tgz b/assets/rancher-logging/rancher-logging-crd-3.4.000.tgz deleted file mode 100644 index 254aabb48..000000000 Binary files a/assets/rancher-logging/rancher-logging-crd-3.4.000.tgz and /dev/null differ diff --git a/packages/rancher-logging/rancher-logging.patch b/packages/rancher-logging/rancher-logging.patch index 25dccfaad..9376fd9a7 100644 --- a/packages/rancher-logging/rancher-logging.patch +++ b/packages/rancher-logging/rancher-logging.patch @@ -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