Generated changes

pull/866/head
actions 2020-11-23 17:17:46 +00:00
parent 80ccd347ad
commit 5fea181809
9 changed files with 101 additions and 21 deletions

View File

@ -1053,10 +1053,10 @@ entries:
catalog.cattle.io/ui-component: logging
apiVersion: v1
appVersion: 3.8.0
created: "2020-11-23T17:06:54.867594599Z"
created: "2020-11-23T17:17:46.133479863Z"
description: Collects and filter logs using highly configurable CRDs. Powered
by Banzai Cloud Logging Operator.
digest: f0dafc49faa3b51971c559106a303a2fbf67a2fb24c3a3b5b4d3967c883ce73d
digest: a527e74e5cf74b33a5fdff453cd660ecb987d9b8c1ef3b5b4d5a773a0dd23fab
icon: https://charts.rancher.io/assets/logos/logging.svg
keywords:
- logging
@ -1141,9 +1141,9 @@ entries:
catalog.cattle.io/namespace: cattle-logging-system
catalog.cattle.io/release-name: rancher-logging-crd
apiVersion: v1
created: "2020-11-23T17:06:54.869054332Z"
created: "2020-11-23T17:17:46.196715743Z"
description: Installs the CRDs for rancher-logging.
digest: b94801ec55acf1269830f600792863dbf7cea4f993f32d57fcd539f19608c750
digest: 92eca9fef67bad369b311b07974a05d156546104119f6864ff9c46decb966909
name: rancher-logging-crd
type: application
urls:
@ -1880,4 +1880,4 @@ entries:
urls:
- assets/rio/rio-0.8.000.tgz
version: 0.8.000
generated: "2020-11-23T17:06:54.866283571Z"
generated: "2020-11-23T17:17:46.132232262Z"

View File

@ -0,0 +1,39 @@
{{- if .Values.additionalLoggingSources.aks.enabled }}
apiVersion: logging.banzaicloud.io/v1beta1
kind: Logging
metadata:
name: {{ .Release.Name }}-aks
namespace: {{ .Release.Namespace }}
labels:
{{ include "logging-operator.labels" . | indent 4 }}
spec:
controlNamespace: {{ .Release.Namespace }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
tag: {{ .Values.images.fluentbit.tag }}
inputTail:
Tag: "aks"
Path: "/var/log/azure/kubelet-status.log"
{{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }}
{{- with $total_tolerations }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
fluentd:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
tag: {{ .Values.images.fluentd.tag }}
configReloaderImage:
repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
tag: {{ .Values.images.config_reloader.tag }}
disablePvc: {{ .Values.disablePvc }}
{{- with .Values.tolerations }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}

View File

@ -1,4 +1,4 @@
{{- if and .Values.additionalLoggingSources.eks.enabled }}
{{- if .Values.additionalLoggingSources.eks.enabled }}
apiVersion: logging.banzaicloud.io/v1beta1
kind: Logging
metadata:
@ -18,12 +18,10 @@ spec:
Parser: "syslog"
{{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }}
{{- with $total_tolerations }}
tolerations:
{{- toYaml . | nindent 6 }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 6 }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
fluentd:
image:
@ -34,11 +32,9 @@ spec:
tag: {{ .Values.images.config_reloader.tag }}
disablePvc: {{ .Values.disablePvc }}
{{- with .Values.tolerations }}
tolerations:
{{- toYaml . | nindent 6 }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector:
{{- toYaml . | nindent 6 }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}

View File

@ -0,0 +1,39 @@
{{- if .Values.additionalLoggingSources.gke.enabled }}
apiVersion: logging.banzaicloud.io/v1beta1
kind: Logging
metadata:
name: {{ .Release.Name }}-gke
namespace: {{ .Release.Namespace }}
labels:
{{ include "logging-operator.labels" . | indent 4 }}
spec:
controlNamespace: {{ .Release.Namespace }}
fluentbit:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }}
tag: {{ .Values.images.fluentbit.tag }}
inputTail:
Tag: "gke"
Path: "/var/log/kube-proxy.log"
{{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }}
{{- with $total_tolerations }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
fluentd:
image:
repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }}
tag: {{ .Values.images.fluentd.tag }}
configReloaderImage:
repository: {{ template "system_default_registry" . }}{{ .Values.images.config_reloader.repository }}
tag: {{ .Values.images.config_reloader.tag }}
disablePvc: {{ .Values.disablePvc }}
{{- with .Values.tolerations }}
tolerations: {{- toYaml . | nindent 6 }}
{{- end }}
{{- with .Values.nodeSelector }}
nodeSelector: {{- toYaml . | nindent 6 }}
{{- end }}
{{- end }}

View File

@ -96,8 +96,12 @@ additionalLoggingSources:
k3s:
enabled: false
container_engine: "systemd"
aks:
enabled: false
eks:
enabled: false
gke:
enabled: false
images:
config_reloader:

View File

@ -1053,10 +1053,10 @@ entries:
catalog.cattle.io/ui-component: logging
apiVersion: v1
appVersion: 3.8.0
created: "2020-11-23T17:06:54.867594599Z"
created: "2020-11-23T17:17:46.133479863Z"
description: Collects and filter logs using highly configurable CRDs. Powered
by Banzai Cloud Logging Operator.
digest: f0dafc49faa3b51971c559106a303a2fbf67a2fb24c3a3b5b4d3967c883ce73d
digest: a527e74e5cf74b33a5fdff453cd660ecb987d9b8c1ef3b5b4d5a773a0dd23fab
icon: https://charts.rancher.io/assets/logos/logging.svg
keywords:
- logging
@ -1141,9 +1141,9 @@ entries:
catalog.cattle.io/namespace: cattle-logging-system
catalog.cattle.io/release-name: rancher-logging-crd
apiVersion: v1
created: "2020-11-23T17:06:54.869054332Z"
created: "2020-11-23T17:17:46.196715743Z"
description: Installs the CRDs for rancher-logging.
digest: b94801ec55acf1269830f600792863dbf7cea4f993f32d57fcd539f19608c750
digest: 92eca9fef67bad369b311b07974a05d156546104119f6864ff9c46decb966909
name: rancher-logging-crd
type: application
urls:
@ -1880,4 +1880,4 @@ entries:
urls:
- assets/rio/rio-0.8.000.tgz
version: 0.8.000
generated: "2020-11-23T17:06:54.866283571Z"
generated: "2020-11-23T17:17:46.132232262Z"

View File

@ -1,5 +1,7 @@
f1024fbb2e01e87d7b0c1b4a53cfe2dd6705d77a2352d01dbef08628169c0901 packages/rancher-logging/overlay/app-readme.md
2d1166737444451728b72282ab5be35281e9fabc1e278ce9c19e0cab5fbfe151 packages/rancher-logging/overlay/templates/loggings/eks/logging.yaml
96e849846728d34be0cc3d101266577a155d8b11e58011ec1c78ef848cd08b39 packages/rancher-logging/overlay/templates/loggings/aks/logging.yaml
1e6fc556e4496d05693a0617e5734e22b61c7c3343b934fd6006763c8e01a7b4 packages/rancher-logging/overlay/templates/loggings/eks/logging.yaml
b3c0b6782bde663ac320db5f053672d5d4ed574d9c07f2dd89831aa4d4f6f0db packages/rancher-logging/overlay/templates/loggings/gke/logging.yaml
4e0da349300ac13b7fbdbe9b69c075ee0fdf0af582551b10fe02f35ecea6fed8 packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-openrc.yaml
36f064a746d5a8c6212cf44c7b24f0342101124eadf586354d9d4794dd0f1525 packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-systemd.yaml
64973ef883de3fd86e0e2071f91709af7bc4432dfba81c54d3e52c531c620f63 packages/rancher-logging/overlay/templates/loggings/rke/configmap.yaml
@ -12,4 +14,4 @@ f1ee119ba457babc749929a8030daac1bcba82b5675839aace23e65d0f8efa80 packages/ranch
9759885410521de627648ea19c2ba4ebf449df446396d7537c3f614b054381a3 packages/rancher-logging/overlay/templates/loggings/root/logging.yaml
5b5dc020e58a8b89c3e7ee7330f2f91d25b1f381b0038fad7bc76208adac0bad packages/rancher-logging/overlay/templates/userroles.yaml
1aae8375db6228b1530534d62037de213f4e253efa9940b4aec9fd92ba08db52 packages/rancher-logging/package.yaml
4b0a829ffcb2288af22e9ec361a09aecfec6050dfae83a7b7bcf7e555a8903f3 packages/rancher-logging/rancher-logging.patch
f4dbcf7b69d9be2b745b5106962c47612e05e0e9d7e880acc3eda6f317a21325 packages/rancher-logging/rancher-logging.patch