diff --git a/stable/aws-for-fluent-bit/Chart.yaml b/stable/aws-for-fluent-bit/Chart.yaml index f612ec887..7265041fe 100644 --- a/stable/aws-for-fluent-bit/Chart.yaml +++ b/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.2.0 +version: 0.2.1 appVersion: 3.2.1 home: https://github.com/aws/eks-charts icon: https://raw.githubusercontent.com/aws/eks-charts/master/docs/logo/aws.png diff --git a/stable/aws-for-fluent-bit/README.md b/stable/aws-for-fluent-bit/README.md index a91ed08cb..dd132c817 100755 --- a/stable/aws-for-fluent-bit/README.md +++ b/stable/aws-for-fluent-bit/README.md @@ -225,6 +225,7 @@ helm delete aws-for-fluent-bit --namespace kube-system | `tolerations`| Optional deployment tolerations |`[]`| | `nodeSelector`| Node labels for pod assignment |`{}`| | `annotations`| Optional pod annotations |`{}`| +| `podLabels` | Optional pod labels |`{}`| | `volumes`| Volumes for the pods, provide as a list of volume objects (see values.yaml) | volumes for /var/log and /var/lib/docker/containers are present, along with a fluentbit config volume | | `volumeMounts`| Volume mounts for the pods, provided as a list of volumeMount objects (see values.yaml) | volumes for /var/log and /var/lib/docker/containers are mounted, along with a fluentbit config volume | | `dnsPolicy`| Optional dnsPolicy |`ClusterFirst`| diff --git a/stable/aws-for-fluent-bit/templates/daemonset.yaml b/stable/aws-for-fluent-bit/templates/daemonset.yaml index 23e551da0..500a9952a 100755 --- a/stable/aws-for-fluent-bit/templates/daemonset.yaml +++ b/stable/aws-for-fluent-bit/templates/daemonset.yaml @@ -19,7 +19,8 @@ spec: {{- toYaml .Values.annotations | nindent 8 }} {{- end }} labels: - {{- include "aws-for-fluent-bit.selectorLabels" . | nindent 8 }} + {{- $labels := merge (include "aws-for-fluent-bit.selectorLabels" . | fromYaml) (.Values.podLabels | default dict) }} + {{- toYaml $labels | nindent 8 }} spec: {{- if .Values.imagePullSecrets }} imagePullSecrets: diff --git a/stable/aws-for-fluent-bit/values.yaml b/stable/aws-for-fluent-bit/values.yaml index d06bbd6cd..de72525d5 100644 --- a/stable/aws-for-fluent-bit/values.yaml +++ b/stable/aws-for-fluent-bit/values.yaml @@ -304,6 +304,8 @@ annotations: {} # iam.amazonaws.com/role: arn:aws:iam::123456789012:role/role-for-fluent-bit +podLabels: {} + # Specifies if aws-for-fluent-bit should be started in hostNetwork mode. # # This is required if using a custom CNI where the managed control plane nodes are unable to initiate