From d553e44380e934cc84bea72525fb9d694c3e23d9 Mon Sep 17 00:00:00 2001 From: Meza Date: Mon, 24 Feb 2025 19:38:17 -0500 Subject: [PATCH] Add priorityClassName to DaemonSet/Logging/FluentBitAgent resources Signed-off-by: Meza --- .../overlay/templates/_generic_fluentbitagent.yaml | 3 +++ .../overlay/templates/_generic_logging.yaml | 5 ++++- .../overlay/templates/loggings/k3s/daemonset.yaml | 3 +++ .../overlay/templates/loggings/rke/daemonset.yaml | 3 +++ .../overlay/templates/loggings/rke2/daemonset.yaml | 3 +++ .../4.10/generated-changes/patch/values.yaml.patch | 6 ++++-- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packages/rancher-logging/4.10/generated-changes/overlay/templates/_generic_fluentbitagent.yaml b/packages/rancher-logging/4.10/generated-changes/overlay/templates/_generic_fluentbitagent.yaml index 44f2303d..701fd97b 100644 --- a/packages/rancher-logging/4.10/generated-changes/overlay/templates/_generic_fluentbitagent.yaml +++ b/packages/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 index ee39ef96..40b1dd87 100644 --- 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 -}} \ No newline at end of file +{{- end -}} diff --git a/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml b/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml index 4700873f..e8584904 100644 --- a/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/k3s/daemonset.yaml +++ b/packages/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/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke/daemonset.yaml b/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke/daemonset.yaml index b050e8d1..c81b72d4 100644 --- a/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke/daemonset.yaml +++ b/packages/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/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml b/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml index 37f3b353..212223f7 100644 --- a/packages/rancher-logging/4.10/generated-changes/overlay/templates/loggings/rke2/daemonset.yaml +++ b/packages/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 index 46752ce6..53af8755 100644 --- 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"