Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[dev-v2.8] [rancher-logging] Backport PR #2646, logging account service annotation #3752

Closed
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
chore: rancher-logging 103.0.2+up3.17.10 make charts
wombelix committed Apr 8, 2024
commit e0235f573c173f6320a1c63fbcd5c520c339e539
Binary file modified assets/rancher-logging/rancher-logging-103.0.2+up3.17.10.tgz
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -13,6 +13,15 @@ spec:
Tag: "eks"
Path: {{ $logPath }}
Parser: "syslog"
fluentd:
{{- if .Values.loggingServiceAccountAnnotations.eks }}
serviceAccount:
metadata:
annotations:
{{- with .Values.loggingServiceAccountAnnotations.eks }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- end }}
{{- end -}}
{{- if .Values.additionalLoggingSources.eks.enabled }}
{{- include "logging-operator.logging" (list . "logging-operator.logging.eks") -}}
Original file line number Diff line number Diff line change
@@ -78,5 +78,14 @@ spec:
Merge_Parser: "{{ .Values.fluentbit.filterKubernetes.Merge_Parser }}"
{{- end }}
{{- end }}
fluentd:
{{- if .Values.loggingServiceAccountAnnotations.root }}
serviceAccount:
metadata:
annotations:
{{- with .Values.loggingServiceAccountAnnotations.root }}
{{ toYaml . | indent 8 }}
{{- end }}
{{- end }}
{{- end -}}
{{- include "logging-operator.logging" (list . "logging-operator.logging.root") -}}
21 changes: 21 additions & 0 deletions charts/rancher-logging/103.0.2+up3.17.10/values.yaml
Original file line number Diff line number Diff line change
@@ -107,6 +107,27 @@ monitoring:
serviceAccount:
annotations: {}

# Logging CR specific serviceAccount annotations
loggingServiceAccountAnnotations: {}
## Syntax ##
# <logging-name>:
# <key>: <value>
#
## Example ##
#
# root:
# eks.amazonaws.com/role-arn: <RoleARN>
#
## Result - added to the Logging resource ##
#
# spec:
# fluentd:
# serviceAccount:
# metadata:
# annotations:
# eks.amazonaws.com/role-arn: arn:aws:iam::1234567890:role/my-iam-role
#

###################################
# Rancher Logging Operator Values #
###################################
4 changes: 2 additions & 2 deletions index.yaml
Original file line number Diff line number Diff line change
@@ -13582,10 +13582,10 @@ entries:
catalog.cattle.io/upstream-version: 3.17.10
apiVersion: v1
appVersion: 3.17.10
created: "2024-04-08T08:19:40.408031977Z"
created: "2024-04-08T08:34:57.556303115Z"
description: Collects and filter logs using highly configurable CRDs. Powered
by Banzai Cloud Logging Operator.
digest: 0758c3d68ecd66389a3c8661af866e80a5b5ed39308d9f8e789fce0617bb4ea5
digest: 851d4bedf640a56063e8376826d7f185ce328d2429136422b293cd8236209177
icon: https://charts.rancher.io/assets/logos/logging.svg
keywords:
- logging