Fix duplicate fluentbitagent toleartions

charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/_generic_fluentbitagent.yaml

@@ -47,9 +47,7 @@ spec:
     Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString | quote }}
     {{- end }}
   {{- end }}
-  {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations)) }}
-  tolerations: {{- toYaml . | nindent 6 }}
-  {{- end }}
+  tolerations: {{- include "customTolerations" . | nindent 6 }}
   {{- with .Values.nodeSelector }}
   nodeSelector: {{- toYaml . | nindent 6 }}
   {{- end }}

charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/_helpers.tpl

@@ -94,6 +94,24 @@ true
 {{- (include "windowsPathPrefix" .) | replace "C:" "" -}}
 {{- end -}}
 
+{{/*
+Set tolerations based on Kubernetes distribution and merge with values.yaml
+*/}}
+{{- define "customTolerations" -}}
+{{- $isRKE := .Values.additionalLoggingSources.rke.enabled -}}
+{{- $defaultTolerations := list -}}
+{{- if $isRKE }}
+  {{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/controlplane" "value" "true" "effect" "NoSchedule") -}}
+{{- else }}
+  {{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/control-plane" "value" "true" "effect" "NoSchedule") -}}
+{{- end }}
+{{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/etcd" "value" "true" "effect" "NoExecute") -}}
+{{- $userTolerations := .Values.tolerations | default list -}}
+{{- $fluentbitTolerations := .Values.fluentbit.tolerations | default list -}}
+{{- $mergedTolerations := concat $defaultTolerations $userTolerations $fluentbitTolerations -}}
+{{- toYaml $mergedTolerations }}
+{{- end -}}
+
 {{/*
 Set the controlplane selector based on kubernetes distribution
 */}}

charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/loggings/kube-audit/fluentbitagent.yaml

@@ -13,9 +13,11 @@ spec:
     Tag: {{ .Values.additionalLoggingSources.kubeAudit.fluentbit.logTag }}
     Path: /kube-audit-logs/{{ template "kubeAuditFilename" . }}
     Parser: json
-  {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations) (.Values.additionalLoggingSources.kubeAudit.fluentbit.tolerations)) }}
-  tolerations: {{- toYaml . | nindent 6 }}
-  {{- end }}
+  tolerations:
+    {{- include "customTolerations" . | nindent 6 }}
+    {{- with .Values.additionalLoggingSources.kubeAudit.fluentbit.tolerations }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
   nodeSelector: {{ include "controlplaneSelector" . | nindent 6 }}
   {{- include "logging-operator.individualFluentbit" $individualValues | nindent 2 }}
 {{- end -}}

charts/rancher-logging/106.0.0-rc.1+up4.10.0/templates/loggings/rke/daemonset.yaml

@@ -51,10 +51,7 @@ spec:
           configMap:
             name: "{{ .Release.Name }}-rke"
       serviceAccountName: "{{ .Release.Name }}-rke-aggregator"
-      {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit.tolerations) }}
-      {{- with $total_tolerations }}
-      tolerations: {{- toYaml . | nindent 8 }}
-      {{- end }}
+      tolerations: {{- include "customTolerations" . | nindent 8 }}
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}

charts/rancher-logging/106.0.0-rc.1+up4.10.0/values.yaml

@@ -419,13 +419,7 @@ additionalLoggingSources:
     pathPrefix: ""
     fluentbit:
       logTag: kube-audit
-      tolerations:
-      - key: node-role.kubernetes.io/control-plane
-        value: "true"
-        effect: NoSchedule
-      - key: node-role.kubernetes.io/etcd
-        value: "true"
-        effect: NoExecute
+      tolerations: []
 
 # configures node agent options for windows node agents
 nodeAgents:
@@ -458,13 +452,7 @@ fluentbit:
     Multiline_Flush: ""
     Skip_Long_Lines: ""
   resources: {}
-  tolerations:
-    - key: node-role.kubernetes.io/control-plane
-      value: "true"
-      effect: NoSchedule
-    - key: node-role.kubernetes.io/etcd
-      value: "true"
-      effect: NoExecute
+  tolerations: []
   filterKubernetes:
     Merge_Log: ""
     Merge_Log_Key: ""

index.yaml

@@ -14847,9 +14847,9 @@ entries:
       catalog.cattle.io/upstream-version: 4.10.0
     apiVersion: v2
     appVersion: 4.10.0
-    created: "2025-01-31T19:23:27.399296+05:30"
+    created: "2025-02-04T11:11:32.641527849+05:30"
     description: Logging operator for Kubernetes based on Fluentd and Fluentbit.
-    digest: 8e73d37d4854b3062bb0a2bd700180c6d47f2bfa7627f0b5d2bab6d6be225fd7
+    digest: c9526456fe731e557fb55767d0e54acbe76a7ab93d91792bf5556152faf9c67b
     home: https://kube-logging.github.io
     icon: file://assets/logos/rancher-logging.svg
     keywords:

packages/rancher-logging/generated-changes/overlay/templates/_generic_fluentbitagent.yaml

@@ -47,9 +47,7 @@ spec:
     Skip_Long_Lines: {{ .Values.fluentbit.inputTail.Skip_Long_Lines | toString | quote }}
     {{- end }}
   {{- end }}
-  {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations)) }}
-  tolerations: {{- toYaml . | nindent 6 }}
-  {{- end }}
+  tolerations: {{- include "customTolerations" . | nindent 6 }}
   {{- with .Values.nodeSelector }}
   nodeSelector: {{- toYaml . | nindent 6 }}
   {{- end }}

packages/rancher-logging/generated-changes/overlay/templates/loggings/kube-audit/fluentbitagent.yaml

@@ -13,9 +13,11 @@ spec:
     Tag: {{ .Values.additionalLoggingSources.kubeAudit.fluentbit.logTag }}
     Path: /kube-audit-logs/{{ template "kubeAuditFilename" . }}
     Parser: json
-  {{- with (concat (.Values.tolerations) (.Values.fluentbit.tolerations) (.Values.additionalLoggingSources.kubeAudit.fluentbit.tolerations)) }}
-  tolerations: {{- toYaml . | nindent 6 }}
-  {{- end }}
+  tolerations:
+    {{- include "customTolerations" . | nindent 6 }}
+    {{- with .Values.additionalLoggingSources.kubeAudit.fluentbit.tolerations }}
+      {{- toYaml . | nindent 6 }}
+    {{- end }}
   nodeSelector: {{ include "controlplaneSelector" . | nindent 6 }}
   {{- include "logging-operator.individualFluentbit" $individualValues | nindent 2 }}
 {{- end -}}

packages/rancher-logging/generated-changes/overlay/templates/loggings/rke/daemonset.yaml

@@ -51,10 +51,7 @@ spec:
           configMap:
             name: "{{ .Release.Name }}-rke"
       serviceAccountName: "{{ .Release.Name }}-rke-aggregator"
-      {{- $total_tolerations := concat (.Values.tolerations) (.Values.fluentbit.tolerations) }}
-      {{- with $total_tolerations }}
-      tolerations: {{- toYaml . | nindent 8 }}
-      {{- end }}
+      tolerations: {{- include "customTolerations" . | nindent 8 }}
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}

packages/rancher-logging/generated-changes/patch/templates/_helpers.tpl.patch

@@ -1,6 +1,6 @@
 --- charts-original/templates/_helpers.tpl
 +++ charts/templates/_helpers.tpl
-@@ -64,6 +64,127 @@
+@@ -64,6 +64,145 @@
  app.kubernetes.io/managed-by: {{ .Release.Service }}
  {{- end -}}
 
@@ -35,6 +35,24 @@
 +{{- end -}}
 +
 +{{/*
++Set tolerations based on Kubernetes distribution and merge with values.yaml
++*/}}
++{{- define "customTolerations" -}}
++{{- $isRKE := .Values.additionalLoggingSources.rke.enabled -}}
++{{- $defaultTolerations := list -}}
++{{- if $isRKE }}
++  {{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/controlplane" "value" "true" "effect" "NoSchedule") -}}
++{{- else }}
++  {{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/control-plane" "value" "true" "effect" "NoSchedule") -}}
++{{- end }}
++{{- $defaultTolerations = append $defaultTolerations (dict "key" "node-role.kubernetes.io/etcd" "value" "true" "effect" "NoExecute") -}}
++{{- $userTolerations := .Values.tolerations | default list -}}
++{{- $fluentbitTolerations := .Values.fluentbit.tolerations | default list -}}
++{{- $mergedTolerations := concat $defaultTolerations $userTolerations $fluentbitTolerations -}}
++{{- toYaml $mergedTolerations }}
++{{- end -}}
++
++{{/*
 +Set the controlplane selector based on kubernetes distribution
 +*/}}
 +{{- define "controlplaneSelector" -}}
@@ -128,7 +146,7 @@
  {{/*
  Formats the cluster domain as a suffix, e.g.:
  .Values.clusterDomain == "", returns ""
-@@ -74,3 +195,37 @@
+@@ -74,3 +213,37 @@
  {{- printf ".%s" .Values.clusterDomain -}}
  {{- end -}}
  {{- end -}}

packages/rancher-logging/generated-changes/patch/values.yaml.patch

@@ -36,7 +36,7 @@
        # -- storage class for event tailer pvc
        accessModes:
          - ReadWriteOnce
-@@ -309,14 +304,176 @@
+@@ -309,14 +304,164 @@
    image: fluent/fluent-bit
    pullPolicy: IfNotPresent
    port: 8080
@@ -163,13 +163,7 @@
 +    pathPrefix: ""
 +    fluentbit:
 +      logTag: kube-audit
-+      tolerations:
-+      - key: node-role.kubernetes.io/control-plane
-+        value: "true"
-+        effect: NoSchedule
-+      - key: node-role.kubernetes.io/etcd
-+        value: "true"
-+        effect: NoExecute
++      tolerations: []
 +
 +# configures node agent options for windows node agents
 +nodeAgents:
@@ -202,13 +196,7 @@
 +    Multiline_Flush: ""
 +    Skip_Long_Lines: ""
 +  resources: {}
-+  tolerations:
-+    - key: node-role.kubernetes.io/control-plane
-+      value: "true"
-+      effect: NoSchedule
-+    - key: node-role.kubernetes.io/etcd
-+      value: "true"
-+      effect: NoExecute
++  tolerations: []
 +  filterKubernetes:
 +    Merge_Log: ""
 +    Merge_Log_Key: ""
@@ -221,7 +209,7 @@
 
  # -- Extra manifests to deploy as an array
  extraManifests: []
-@@ -327,3 +484,12 @@
+@@ -327,3 +472,12 @@
    #     name: extra-manifest
    #   data:
    #     extra-data: "value"