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

stable/aws-for-fluent-bit/Chart.yaml

@@ -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

stable/aws-for-fluent-bit/README.md

@@ -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 | |

stable/aws-for-fluent-bit/templates/_helpers.tpl

@@ -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 -}}
 
 {{/*

stable/aws-for-fluent-bit/templates/daemonset.yaml

@@ -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:

stable/aws-for-fluent-bit/templates/servicemonitor.yaml

@@ -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 }}

stable/aws-for-fluent-bit/values.yaml

@@ -10,6 +10,7 @@ image:
 imagePullSecrets: []
 nameOverride: ""
 fullnameOverride: ""
+extraLabels: {}
 
 podSecurityContext: {}
 # runAsUser: 1000
@@ -388,4 +389,4 @@ serviceMonitor:
     #   path: /metrics
     #   interval: 30s
     #   scrapeTimeout: 10s
-    #   scheme: http
+    #   scheme: http