diff --git a/deployment-scripts/helm-charts/deepfence-agent/templates/daemonset.yaml b/deployment-scripts/helm-charts/deepfence-agent/templates/daemonset.yaml index 54cf566027..3295ca1b41 100644 --- a/deployment-scripts/helm-charts/deepfence-agent/templates/daemonset.yaml +++ b/deployment-scripts/helm-charts/deepfence-agent/templates/daemonset.yaml @@ -21,12 +21,12 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: - {{- if .Values.priorityClassName }} - priorityClassName: {{ .Values.priorityClassName | quote }} - {{- end }} hostPID: true hostNetwork: true serviceAccountName: {{ include "deepfence-agent.serviceAccountName" . }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} dnsPolicy: ClusterFirstWithHostNet volumes: {{- if .Values.mountContainerRuntimeSocket.dockerSock }} diff --git a/deployment-scripts/helm-charts/deepfence-agent/templates/deployment.yaml b/deployment-scripts/helm-charts/deepfence-agent/templates/deployment.yaml index 042815a9e0..797ec54415 100644 --- a/deployment-scripts/helm-charts/deepfence-agent/templates/deployment.yaml +++ b/deployment-scripts/helm-charts/deepfence-agent/templates/deployment.yaml @@ -24,6 +24,9 @@ spec: {{- end }} spec: serviceAccountName: {{ include "deepfence-agent.serviceAccountName" . }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: deepfence-cluster-agent image: "{{ .Values.cluster_agent.image.name }}:{{ default .Values.global.imageTag .Values.cluster_agent.image.tag }}" diff --git a/deployment-scripts/helm-charts/deepfence-agent/values.yaml b/deployment-scripts/helm-charts/deepfence-agent/values.yaml index 6d21ca8746..2c5682e21d 100644 --- a/deployment-scripts/helm-charts/deepfence-agent/values.yaml +++ b/deployment-scripts/helm-charts/deepfence-agent/values.yaml @@ -96,6 +96,7 @@ instanceIdSuffix: "N" # comma separated list of tags (labels) to set for all agents userDefinedTags: "" +# priorityClassName for pods priorityClassName: "" enableGraphReport: true diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/database/fileserver/fileserver.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/database/fileserver/fileserver.yaml index 1c806bf3f8..87c638af7c 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/database/fileserver/fileserver.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/database/fileserver/fileserver.yaml @@ -30,6 +30,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.fileserver.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: fileserver securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/database/kafka/kafka.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/database/kafka/kafka.yaml index 3fa8219f13..3226a92e35 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/database/kafka/kafka.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/database/kafka/kafka.yaml @@ -30,6 +30,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.kafka.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} affinity: podAntiAffinity: preferredDuringSchedulingIgnoredDuringExecution: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/database/neo4j/neo4j.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/database/neo4j/neo4j.yaml index 36047c7ddb..22614671e4 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/database/neo4j/neo4j.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/database/neo4j/neo4j.yaml @@ -30,6 +30,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.neo4j.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: neo4j securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/database/postgres/postgres.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/database/postgres/postgres.yaml index 8e5faf2702..58cb42ff45 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/database/postgres/postgres.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/database/postgres/postgres.yaml @@ -30,6 +30,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.postgres.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: postgres securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/database/redis/redis.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/database/redis/redis.yaml index 23a83e643d..246e79f912 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/database/redis/redis.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/database/redis/redis.yaml @@ -30,6 +30,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.redis.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: redis securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-agent.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-agent.yaml index 1cb297ab4f..ff5074589e 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-agent.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-agent.yaml @@ -26,6 +26,9 @@ spec: hostNetwork: true serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} automountServiceAccountToken: true + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} dnsPolicy: ClusterFirstWithHostNet volumes: {{- if .Values.console_agents.mountContainerRuntimeSocket.dockerSock }} diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-cluster-agent.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-cluster-agent.yaml index e4183d08cc..3450695cba 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-cluster-agent.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-cluster-agent.yaml @@ -26,6 +26,9 @@ spec: spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} automountServiceAccountToken: true + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: deepfence-cluster-agent image: "{{ .Values.global.imageRepoPrefix }}/{{ .Values.console_agents.cluster_agent.image.repository }}:{{ default .Values.global.imageTag .Values.console_agents.cluster_agent.image.tag }}" diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ingester.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ingester.yaml index b1e523b1f7..3240faac30 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ingester.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ingester.yaml @@ -29,6 +29,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.ingester.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: ingester securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml index aaebfb0bc9..0d26a83782 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-router.yaml @@ -29,6 +29,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.router.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: router securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-scheduler.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-scheduler.yaml index 19b3535c8b..af0115845f 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-scheduler.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-scheduler.yaml @@ -27,6 +27,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.scheduler.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: scheduler securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-server.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-server.yaml index c8e9414e16..6a31a4d7b2 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-server.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-server.yaml @@ -30,6 +30,9 @@ spec: automountServiceAccountToken: true securityContext: {{- toYaml .Values.server.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: server securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ui.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ui.yaml index a0768c4247..889b3e10fa 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ui.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-ui.yaml @@ -29,6 +29,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.ui.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: ui securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-worker.yaml b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-worker.yaml index 1d07a4e1ee..f2aa871605 100644 --- a/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-worker.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/templates/deepfence-worker.yaml @@ -29,6 +29,9 @@ spec: serviceAccountName: {{ include "deepfence-console.serviceAccountName" . }} securityContext: {{- toYaml .Values.worker.podSecurityContext | nindent 8 }} + {{- if .Values.priorityClassName }} + priorityClassName: {{ .Values.priorityClassName | quote }} + {{- end }} containers: - name: worker securityContext: diff --git a/deployment-scripts/helm-charts/deepfence-console/values.yaml b/deployment-scripts/helm-charts/deepfence-console/values.yaml index bc111c5de1..0932a82d58 100644 --- a/deployment-scripts/helm-charts/deepfence-console/values.yaml +++ b/deployment-scripts/helm-charts/deepfence-console/values.yaml @@ -5,6 +5,9 @@ nameOverride: "" fullnameOverride: "" +# priorityClassName for pods +priorityClassName: "" + # Add labels to all the deployed resources commonLabels: {}