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.

Sign up for GitHub

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

aws-for-fluent-bit: Add extraLabels parameter, fix ServiceMonitor namespace selector #1035

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

aws-for-fluent-bit: Add extraLabels parameter, fix ServiceMonitor namespace selector #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f5953fc
aws-for-fluent-bit: Add extraLabels parameter
crdrost Dec 5, 2023
6e90cf6
aws-for-fluent-bit: Fix ServiceMonitor ns selector
crdrost Dec 8, 2023
c202cb8
Add full labels to DaemonSet
crdrost Dec 13, 2023
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
2 changes: 1 addition & 1 deletion stable/aws-for-fluent-bit/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: v1
name: aws-for-fluent-bit
description: A Helm chart to deploy aws-for-fluent-bit project
version: 0.1.32
version: 0.1.33
appVersion: 2.31.12.20231011
home: https://github.com/aws/eks-charts
icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png
Expand Down
1 change: 1 addition & 0 deletions stable/aws-for-fluent-bit/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ helm delete aws-for-fluent-bit --namespace kube-system
| `input.memBufLimit` | Limit the [buffer memory](https://github.com/aws-samples/amazon-ecs-firelens-examples/tree/mainline/examples/fluent-bit/oomkill-prevention) used by the tail input. | `5MB` |
| `input.skipLongLines` | `On` means that long lines will be skipped [instead of the entire log file](https://github.com/aws/aws-for-fluent-bit/blob/mainline/troubleshooting/debugging.md#tail-input-skipping-file) | `On` |
| `input.refreshInterval` | The interval to refresh the list of watched files in seconds. | `10` |
| `extraLabels` | Dict of Kubernetes labels to add to the defaults shipped by this chart | `{}` |
| `extraInputs` | Append to existing input with this value | `""` |
| `additionalInputs` | Adding more inputs with this value | `""` |
| `filter.*` | Values for kubernetes filter | |
Expand Down
3 changes: 3 additions & 0 deletions stable/aws-for-fluent-bit/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ helm.sh/chart: {{ include "aws-for-fluent-bit.chart" . }}
app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
{{- end }}
app.kubernetes.io/managed-by: {{ .Release.Service }}
{{- if .Values.extraLabels }}
{{ toYaml .Values.extraLabels }}
{{- end }}
{{- end -}}

{{/*
Expand Down
2 changes: 1 addition & 1 deletion stable/aws-for-fluent-bit/templates/daemonset.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ spec:
{{- toYaml .Values.annotations | nindent 8 }}
{{- end }}
labels:
{{- include "aws-for-fluent-bit.selectorLabels" . | nindent 8 }}
{{- include "aws-for-fluent-bit.labels" . | nindent 8 }}
spec:
{{- if .Values.imagePullSecrets }}
imagePullSecrets:
Expand Down
2 changes: 1 addition & 1 deletion stable/aws-for-fluent-bit/templates/servicemonitor.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ spec:
jobLabel: {{ default "app.kubernetes.io/instance" .Values.serviceMonitor.jobLabel }}
namespaceSelector:
matchNames:
- {{ .Release.Namespace }}
- {{ include "aws-for-fluent-bit.namespace" . }}
selector:
matchLabels:
{{- include "aws-for-fluent-bit.selectorLabels" . | nindent 6 }}
Expand Down
3 changes: 2 additions & 1 deletion stable/aws-for-fluent-bit/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ image:
imagePullSecrets: []
nameOverride: ""
fullnameOverride: ""
extraLabels: {}

podSecurityContext: {}
# runAsUser: 1000
Expand Down Expand Up @@ -388,4 +389,4 @@ serviceMonitor:
# path: /metrics
# interval: 30s
# scrapeTimeout: 10s
# scheme: http
# scheme: http