Add priorityClassName to DaemonSet/Logging/FluentBitAgent resources

Signed-off-by: Meza <[email protected]>
rancher · Feb 25, 2025 · d553e44 · d553e44
1 parent 3f63448
commit d553e44
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 3 deletions.
diff --git a/...ges/rancher-logging/4.10/generated-changes/overlay/templates/_generic_fluentbitagent.yaml b/...ges/rancher-logging/4.10/generated-changes/overlay/templates/_generic_fluentbitagent.yaml
@@ -53,6 +53,9 @@ spec:
   {{- with .Values.nodeSelector }}
   nodeSelector: {{- toYaml . | nindent 6 }}
   {{- end }}
+  {{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
+  podPriorityClassName: {{ . }}
+  {{- end }}
   {{- with .Values.fluentbit.resources }}
   resources: {{- toYaml . | nindent 6 }}
   {{- end }}

diff --git a/packages/rancher-logging/4.10/generated-changes/overlay/templates/_generic_logging.yaml b/packages/rancher-logging/4.10/generated-changes/overlay/templates/_generic_logging.yaml
@@ -37,6 +37,9 @@ spec:
     {{- with (default .Values.tolerations .Values.fluentd.tolerations) }}
     tolerations: {{- toYaml . | nindent 6 }}
     {{- end }}
+    {{- with (default .Values.priorityClassName .Values.fluentd.podPriorityClassName) }}
+    podPriorityClassName: {{ . }}
+    {{- end }}
     {{- with (default .Values.nodeSelector .Values.fluentd.nodeSelector) }}
     nodeSelector: {{- toYaml . | nindent 6 }}
     {{- end }}
@@ -72,4 +75,4 @@ spec:
 
 {{- define "logging-operator.logging" -}}
 {{- include "logging-operator.util.merge.logging" (append . "logging-operator.logging.tpl") -}}
-{{- end -}}
+{{- end -}}
diff --git a/...ages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml b/...ages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml
@@ -42,6 +42,9 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
       serviceAccountName: "{{ .Release.Name }}-k3s-journald-aggregator"
       volumes:
         - name: config

diff --git a/...ages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke/daemonset.yaml b/...ages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke/daemonset.yaml
@@ -58,6 +58,9 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount

diff --git a/...ges/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml b/...ges/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml
@@ -45,6 +45,9 @@ spec:
       {{- with .Values.nodeSelector }}
       nodeSelector: {{- toYaml . | nindent 8 }}
       {{- end }}
+      {{- with .Values.priorityClassName }}
+      priorityClassName: {{ . }}
+      {{- end }}
       serviceAccountName: "{{ .Release.Name }}-rke2-journald-aggregator"
       volumes:
         - name: config

diff --git a/packages/rancher-logging/4.10/generated-changes/patch/values.yaml.patch b/packages/rancher-logging/4.10/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,178 @@
    image: fluent/fluent-bit
    pullPolicy: IfNotPresent
    port: 8080
@@ -186,6 +186,7 @@
 +    initialDelaySeconds: 30
 +    periodSeconds: 15
 +  nodeSelector: {}
++  podPriorityClassName: ""
 +  resources: {}
 +  tolerations: {}
 +  env: []
@@ -201,6 +202,7 @@
 +    Mem_Buf_Limit: ""
 +    Multiline_Flush: ""
 +    Skip_Long_Lines: ""
++  podPriorityClassName: ""
 +  resources: {}
 +  tolerations:
 +    - key: node-role.kubernetes.io/control-plane
@@ -221,7 +223,7 @@
 
  # -- Extra manifests to deploy as an array
  extraManifests: []
-@@ -327,3 +484,12 @@
+@@ -327,3 +486,12 @@
    #     name: extra-manifest
    #   data:
    #     extra-data: "value"