diff --git a/assets/index.yaml b/assets/index.yaml index 2ce5497be..996b65c83 100644 --- a/assets/index.yaml +++ b/assets/index.yaml @@ -732,10 +732,10 @@ entries: catalog.cattle.io/ui-component: logging apiVersion: v1 appVersion: 3.6.0 - created: "2020-10-12T22:25:01.296988726Z" + created: "2020-10-14T22:10:45.093263054Z" description: Collects and filter logs using highly configurable CRDs. Powered by Banzai Cloud Logging Operator. - digest: a88b0e11e95ebf44082bde5b5d7af14f7c2bdbfeea8b33aba95fd65c8bd40afa + digest: 768bfd53d8f2cc5f066317b90b6ace26dd0d55c014e763c36505abd0227af681 icon: https://charts.rancher.io/assets/logos/logging.svg keywords: - logging @@ -774,9 +774,9 @@ entries: catalog.cattle.io/namespace: cattle-logging-system catalog.cattle.io/release-name: rancher-logging-crd apiVersion: v1 - created: "2020-10-12T22:25:01.298552958Z" + created: "2020-10-14T22:10:45.095088457Z" description: Installs the CRDs for rancher-logging. - digest: 360341125600cfe7e883618bfc76639061ff3384e6624c0287c9128521d9af40 + digest: 434a3e5895dc466e2a29f39d853545bdd0ab3cddb483fda5bc26431f4bb5b050 name: rancher-logging-crd type: application urls: @@ -1228,4 +1228,4 @@ entries: urls: - assets/rio/rio-0.8.000.tgz version: 0.8.000 -generated: "2020-10-13T21:30:30.309485364Z" +generated: "2020-10-14T22:10:45.090332848Z" diff --git a/assets/rancher-logging/rancher-logging-3.6.001.tgz b/assets/rancher-logging/rancher-logging-3.6.001.tgz index 41da24818..8543cf197 100644 Binary files a/assets/rancher-logging/rancher-logging-3.6.001.tgz and b/assets/rancher-logging/rancher-logging-3.6.001.tgz differ diff --git a/assets/rancher-logging/rancher-logging-crd-3.6.001.tgz b/assets/rancher-logging/rancher-logging-crd-3.6.001.tgz index eecc9fe84..000cbacf9 100644 Binary files a/assets/rancher-logging/rancher-logging-crd-3.6.001.tgz and b/assets/rancher-logging/rancher-logging-crd-3.6.001.tgz differ diff --git a/charts/rancher-logging/templates/deployment.yaml b/charts/rancher-logging/templates/deployment.yaml index 3bd85416a..da93d4c29 100755 --- a/charts/rancher-logging/templates/deployment.yaml +++ b/charts/rancher-logging/templates/deployment.yaml @@ -45,10 +45,10 @@ spec: securityContext: {{ toYaml .Values.podSecurityContext | nindent 8 }} {{- end }} - {{- with .Values.nodeSelector }} + {{- with .Values.nodeSelector }} nodeSelector: {{- toYaml . | nindent 8 }} - {{- end }} + {{- end }} {{- with .Values.affinity }} affinity: {{- toYaml . | nindent 8 }} diff --git a/charts/rancher-logging/templates/loggings/eks/logging.yaml b/charts/rancher-logging/templates/loggings/eks/logging.yaml index d47607bff..6e3018ce1 100644 --- a/charts/rancher-logging/templates/loggings/eks/logging.yaml +++ b/charts/rancher-logging/templates/loggings/eks/logging.yaml @@ -16,10 +16,15 @@ spec: Tag: "eks" Path: "/var/log/messages" Parser: "syslog" - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -28,4 +33,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/k3s/logging-k3s-openrc.yaml b/charts/rancher-logging/templates/loggings/k3s/logging-k3s-openrc.yaml index 0418fad81..3d3b0a27b 100644 --- a/charts/rancher-logging/templates/loggings/k3s/logging-k3s-openrc.yaml +++ b/charts/rancher-logging/templates/loggings/k3s/logging-k3s-openrc.yaml @@ -19,10 +19,15 @@ spec: - source: "/var/log/" destination: "/var/log" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -31,4 +36,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/k3s/logging-k3s-systemd.yaml b/charts/rancher-logging/templates/loggings/k3s/logging-k3s-systemd.yaml index 977db0518..7df78e388 100644 --- a/charts/rancher-logging/templates/loggings/k3s/logging-k3s-systemd.yaml +++ b/charts/rancher-logging/templates/loggings/k3s/logging-k3s-systemd.yaml @@ -19,10 +19,15 @@ spec: - source: "/var/log/" destination: "/var/log" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -31,4 +36,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/rke/logging-containers-rke.yaml b/charts/rancher-logging/templates/loggings/rke/logging-containers-rke.yaml index 0866b22c3..fe458dd35 100644 --- a/charts/rancher-logging/templates/loggings/rke/logging-containers-rke.yaml +++ b/charts/rancher-logging/templates/loggings/rke/logging-containers-rke.yaml @@ -17,10 +17,15 @@ spec: - source: "/var/log/containers/" destination: "/var/log/containers/" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -29,5 +34,13 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/rke/logging-rke.yaml b/charts/rancher-logging/templates/loggings/rke/logging-rke.yaml index 8e4b5c26f..19765fc03 100644 --- a/charts/rancher-logging/templates/loggings/rke/logging-rke.yaml +++ b/charts/rancher-logging/templates/loggings/rke/logging-rke.yaml @@ -19,10 +19,15 @@ spec: - source: "/var/lib/rancher/rke/log" destination: "/rke" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -31,4 +36,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/rke2/daemonset.yaml b/charts/rancher-logging/templates/loggings/rke2/daemonset.yaml index 20fc108bd..a2f763d63 100644 --- a/charts/rancher-logging/templates/loggings/rke2/daemonset.yaml +++ b/charts/rancher-logging/templates/loggings/rke2/daemonset.yaml @@ -23,6 +23,14 @@ spec: name: logdir - mountPath: /fluent-bit/etc/ name: config + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} volumes: - name: logdir hostPath: diff --git a/charts/rancher-logging/templates/loggings/rke2/logging-rke2-containers.yaml b/charts/rancher-logging/templates/loggings/rke2/logging-rke2-containers.yaml index 721c0a981..8768f8479 100644 --- a/charts/rancher-logging/templates/loggings/rke2/logging-rke2-containers.yaml +++ b/charts/rancher-logging/templates/loggings/rke2/logging-rke2-containers.yaml @@ -17,10 +17,15 @@ spec: - source: "/var/log/containers/" destination: "/var/log/containers/" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -29,4 +34,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/rke2/logging-rke2-journald.yaml b/charts/rancher-logging/templates/loggings/rke2/logging-rke2-journald.yaml index f39651d0b..5a993f086 100644 --- a/charts/rancher-logging/templates/loggings/rke2/logging-rke2-journald.yaml +++ b/charts/rancher-logging/templates/loggings/rke2/logging-rke2-journald.yaml @@ -17,10 +17,15 @@ spec: - source: "/etc/rancher/logging/logs/" destination: "/etc/rancher/logging/logs/" readOnly: true - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -29,4 +34,12 @@ spec: 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 }} diff --git a/charts/rancher-logging/templates/loggings/root/logging.yaml b/charts/rancher-logging/templates/loggings/root/logging.yaml index ee2a85038..b67c23d6c 100644 --- a/charts/rancher-logging/templates/loggings/root/logging.yaml +++ b/charts/rancher-logging/templates/loggings/root/logging.yaml @@ -11,10 +11,15 @@ spec: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentbit.repository }} tag: {{ .Values.images.fluentbit.tag }} - {{ with .Values.fluentbit_tolerations }} + {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit_tolerations) }} + {{- with $total_tolerations }} tolerations: - {{ toYaml . | nindent 6 }} - {{ end }} + {{- toYaml . | nindent 6 }} + {{- end }} + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 6 }} + {{- end }} fluentd: image: repository: {{ template "system_default_registry" . }}{{ .Values.images.fluentd.repository }} @@ -23,3 +28,11 @@ spec: 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 }} diff --git a/charts/rancher-logging/values.yaml b/charts/rancher-logging/values.yaml index 8b1eaecd4..1337dbdd9 100755 --- a/charts/rancher-logging/values.yaml +++ b/charts/rancher-logging/values.yaml @@ -32,9 +32,14 @@ resources: {} # cpu: 100m # memory: 128Mi -nodeSelector: {} +nodeSelector: + kubernetes.io/os: linux -tolerations: [] +tolerations: + - key: cattle.io/os + operator: "Equal" + value: "linux" + effect: NoSchedule affinity: {} @@ -105,10 +110,6 @@ images: repository: rancher/fluent-bit-out-syslog tag: 0.1.0 -global: - cattle: - systemDefaultRegistry: "" - fluentbit_tolerations: - key: node-role.kubernetes.io/controlplane value: "true" @@ -116,3 +117,7 @@ fluentbit_tolerations: - key: node-role.kubernetes.io/etcd value: "true" effect: NoExecute + +global: + cattle: + systemDefaultRegistry: "" diff --git a/index.yaml b/index.yaml index 2ce5497be..996b65c83 100644 --- a/index.yaml +++ b/index.yaml @@ -732,10 +732,10 @@ entries: catalog.cattle.io/ui-component: logging apiVersion: v1 appVersion: 3.6.0 - created: "2020-10-12T22:25:01.296988726Z" + created: "2020-10-14T22:10:45.093263054Z" description: Collects and filter logs using highly configurable CRDs. Powered by Banzai Cloud Logging Operator. - digest: a88b0e11e95ebf44082bde5b5d7af14f7c2bdbfeea8b33aba95fd65c8bd40afa + digest: 768bfd53d8f2cc5f066317b90b6ace26dd0d55c014e763c36505abd0227af681 icon: https://charts.rancher.io/assets/logos/logging.svg keywords: - logging @@ -774,9 +774,9 @@ entries: catalog.cattle.io/namespace: cattle-logging-system catalog.cattle.io/release-name: rancher-logging-crd apiVersion: v1 - created: "2020-10-12T22:25:01.298552958Z" + created: "2020-10-14T22:10:45.095088457Z" description: Installs the CRDs for rancher-logging. - digest: 360341125600cfe7e883618bfc76639061ff3384e6624c0287c9128521d9af40 + digest: 434a3e5895dc466e2a29f39d853545bdd0ab3cddb483fda5bc26431f4bb5b050 name: rancher-logging-crd type: application urls: @@ -1228,4 +1228,4 @@ entries: urls: - assets/rio/rio-0.8.000.tgz version: 0.8.000 -generated: "2020-10-13T21:30:30.309485364Z" +generated: "2020-10-14T22:10:45.090332848Z" diff --git a/sha256sum/rancher-logging/rancher-logging.sum b/sha256sum/rancher-logging/rancher-logging.sum index 3d8061fda..12abdaafe 100644 --- a/sha256sum/rancher-logging/rancher-logging.sum +++ b/sha256sum/rancher-logging/rancher-logging.sum @@ -1,14 +1,14 @@ b885b71085b604ac91e4d3ea0c89c7369dfbe7027514343dc71ee6b0c98aac44 packages/rancher-logging/overlay/app-readme.md -21f531040a6bd3e669568476b20d2df2226fd2d988daf1c907e3faca73775132 packages/rancher-logging/overlay/templates/loggings/eks/logging.yaml -46667dae2f822f84b4ef462426a9e005710f76d0ba546c51592f078e21ba54c4 packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-openrc.yaml -8793bbcfb7af4cb695657a59ef62a32984ebd82fc4e24a718df3ed4c003f8d90 packages/rancher-logging/overlay/templates/loggings/k3s/logging-k3s-systemd.yaml -81467d46a585c82af82384fd1045adf82b626f9612d7a027d8e74d9959c48dc5 packages/rancher-logging/overlay/templates/loggings/rke/logging-containers-rke.yaml -343cc5c3a74a07e596c43b987fa4a4c97da12216b9c7e0b292cfedcf8d5c0987 packages/rancher-logging/overlay/templates/loggings/rke/logging-rke.yaml +2d1166737444451728b72282ab5be35281e9fabc1e278ce9c19e0cab5fbfe151 packages/rancher-logging/overlay/templates/loggings/eks/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 +50d64763a6b7cf26ab7c2b5ccd7cd36a53f249910f252254985e65f779cac879 packages/rancher-logging/overlay/templates/loggings/rke/logging-containers-rke.yaml +e83ac9e6a5dc8e3e63b7524ff7d2dc0155d027c5acce59ef95a4aabd2cd2e51d packages/rancher-logging/overlay/templates/loggings/rke/logging-rke.yaml 6c93c0e323d9acc021890b87afb68ebff7d8574364b6522124c18a900561bc0b packages/rancher-logging/overlay/templates/loggings/rke2/configmap.yaml -5fd3ed409160dcfbf862effb22b15b1a9d865a39ba9ea6a9bfc834c057e96f1b packages/rancher-logging/overlay/templates/loggings/rke2/daemonset.yaml -a2846070e315a857c9ed92c10187a8eddf6e6ab2c90032724532d7671666538e packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-containers.yaml -b0ee09e5f46ff91741d475c12740ccb650c151ac3b5fb6c035a8b3a6fca43ad0 packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-journald.yaml -2d5363f54540876ff81005e88abd48ae8b1a47f9b3fd94ffc10dcbec29ae074e packages/rancher-logging/overlay/templates/loggings/root/logging.yaml +9c65f46493ca068e3698b10918f296259839fba933a13a36e7808839fb16cc5e packages/rancher-logging/overlay/templates/loggings/rke2/daemonset.yaml +f1ee119ba457babc749929a8030daac1bcba82b5675839aace23e65d0f8efa80 packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-containers.yaml +49cba865e730b293be16d539d97060285885759c8a4cb7d51c5b03a2e45fc793 packages/rancher-logging/overlay/templates/loggings/rke2/logging-rke2-journald.yaml +9759885410521de627648ea19c2ba4ebf449df446396d7537c3f614b054381a3 packages/rancher-logging/overlay/templates/loggings/root/logging.yaml 5b5dc020e58a8b89c3e7ee7330f2f91d25b1f381b0038fad7bc76208adac0bad packages/rancher-logging/overlay/templates/userroles.yaml fd28d36819b30def0c48f7280db4cfb5046a6d31e5f01cba95caad2fecf7cda5 packages/rancher-logging/package.yaml -e0b15f7aff73eccba125037c68db19c47ebe9eb5adcb357f0407f417b0a9c2c7 packages/rancher-logging/rancher-logging.patch +f6457855e9ec9212c058274ff636eeee4d120618f1e1848a0f64d74435719458 packages/rancher-logging/rancher-logging.patch