2020-07-21 20:22:47 +00:00
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/Chart.yaml packages/rancher-logging/charts/Chart.yaml
|
|
|
|
|
--- packages/rancher-logging/charts-original/Chart.yaml
|
|
|
|
|
+++ packages/rancher-logging/charts/Chart.yaml
|
2020-08-25 20:21:26 +00:00
|
|
|
@@ -1,5 +1,11 @@
|
2020-07-21 20:22:47 +00:00
|
|
|
apiVersion: v1
|
|
|
|
|
appVersion: 3.4.0
|
|
|
|
|
-description: A Helm chart to install Banzai Cloud logging-operator
|
|
|
|
|
-name: logging-operator
|
|
|
|
|
+description: A Helm chart to install Banzai Cloud logging-operator and a cluster logging pipeline.
|
|
|
|
|
+name: rancher-logging
|
|
|
|
|
version: 3.4.0
|
2020-07-30 23:13:01 +00:00
|
|
|
+icon: https://charts.rancher.io/assets/logos/logging.svg
|
2020-07-21 20:22:47 +00:00
|
|
|
+annotations:
|
2020-07-30 23:09:43 +00:00
|
|
|
+ catalog.cattle.io/certified: rancher
|
2020-08-04 01:43:01 +00:00
|
|
|
+ catalog.cattle.io/namespace: cattle-logging-system
|
2020-07-30 23:09:43 +00:00
|
|
|
+ catalog.cattle.io/release-name: rancher-logging
|
2020-08-04 01:43:01 +00:00
|
|
|
+ catalog.cattle.io/ui-component: logging
|
2020-08-17 23:53:55 +00:00
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/templates/_helpers.tpl packages/rancher-logging/charts/templates/_helpers.tpl
|
|
|
|
|
--- packages/rancher-logging/charts-original/templates/_helpers.tpl
|
|
|
|
|
+++ packages/rancher-logging/charts/templates/_helpers.tpl
|
|
|
|
|
@@ -56,3 +56,11 @@
|
|
|
|
|
{{- end }}
|
|
|
|
|
app.kubernetes.io/managed-by: {{ .Release.Service }}
|
|
|
|
|
{{- end -}}
|
|
|
|
|
+
|
|
|
|
|
+{{- define "system_default_registry" -}}
|
|
|
|
|
+{{- if .Values.global.systemDefaultRegistry -}}
|
|
|
|
|
+{{- printf "%s/" .Values.global.systemDefaultRegistry -}}
|
|
|
|
|
+{{- else -}}
|
|
|
|
|
+{{- "" -}}
|
|
|
|
|
+{{- end -}}
|
|
|
|
|
+{{- end -}}
|
2020-07-21 20:22:47 +00:00
|
|
|
diff -x '*.tgz' -x '*.lock' -uNr packages/rancher-logging/charts-original/values.yaml packages/rancher-logging/charts/values.yaml
|
|
|
|
|
--- packages/rancher-logging/charts-original/values.yaml
|
|
|
|
|
+++ packages/rancher-logging/charts/values.yaml
|
|
|
|
|
@@ -18,7 +18,7 @@
|
|
|
|
|
|
|
|
|
|
## Deploy CRDs used by Logging Operator.
|
|
|
|
|
##
|
|
|
|
|
-createCustomResource: true
|
|
|
|
|
+createCustomResource: false
|
|
|
|
|
|
|
|
|
|
resources: {}
|
|
|
|
|
# We usually recommend not to specify default resources and to leave this as a conscious
|
2020-08-31 21:22:23 +00:00
|
|
|
@@ -76,4 +76,32 @@
|
2020-07-21 20:22:47 +00:00
|
|
|
monitoring:
|
|
|
|
|
# Create a Prometheus Operator ServiceMonitor object
|
|
|
|
|
serviceMonitor:
|
|
|
|
|
- enabled: false
|
|
|
|
|
\ No newline at end of file
|
|
|
|
|
+ enabled: true
|
|
|
|
|
+
|
2020-08-17 23:53:55 +00:00
|
|
|
+disablePvc: true
|
|
|
|
|
+
|
2020-08-12 16:35:34 +00:00
|
|
|
+additionalLoggingSources:
|
|
|
|
|
+ rke1:
|
|
|
|
|
+ enabled: false
|
2020-08-25 20:21:26 +00:00
|
|
|
+ rke2:
|
2020-08-17 02:01:52 +00:00
|
|
|
+ enabled: false
|
2020-08-25 20:21:26 +00:00
|
|
|
+ k3s:
|
2020-08-19 19:43:00 +00:00
|
|
|
+ enabled: false
|
2020-08-25 20:21:26 +00:00
|
|
|
+ container_engine: "systemd"
|
2020-08-28 18:45:13 +00:00
|
|
|
+ eks:
|
|
|
|
|
+ enabled: false
|
2020-08-14 20:17:33 +00:00
|
|
|
+
|
2020-08-17 23:53:55 +00:00
|
|
|
+images:
|
|
|
|
|
+ config_reloader:
|
|
|
|
|
+ repository: rancher/jimmidyson-configmap-reload
|
|
|
|
|
+ tag: v0.2.2
|
|
|
|
|
+ fluentbit:
|
|
|
|
|
+ repository: rancher/fluent-fluent-bit
|
|
|
|
|
+ tag: 1.5.0
|
|
|
|
|
+ fluentd:
|
|
|
|
|
+ repository: rancher/banzaicloud-fluentd
|
|
|
|
|
+ tag: v1.10.4-alpine-2
|
|
|
|
|
+ syslog_forwarder:
|
|
|
|
|
+ repository: rancher/fluent-bit-out-syslog
|
|
|
|
|
+ tag: 0.1.0
|
|
|
|
|
+
|
|
|
|
|
+global:
|
|
|
|
|
+ systemDefaultRegistry: ""
|
