Skip to content

Commit d157764

Browse files
no usage of kymas global priorityclass in telemetry and monitoring component (#18026)
* no usage of kymas global priorityclass in telemetry and monitoring * Update resources/monitoring/templates/kyma-additions/priority-class-high.yaml Co-authored-by: Rakesh Garimella <[email protected]> --------- Co-authored-by: Rakesh Garimella <[email protected]>
1 parent 26697b3 commit d157764

File tree

12 files changed

+40
-25
lines changed

12 files changed

+40
-25
lines changed

resources/monitoring/charts/grafana/templates/_pod.tpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ securityContext:
2525
hostAliases:
2626
{{ toYaml .Values.hostAliases | indent 2 }}
2727
{{- end }}
28-
{{- if or .Values.priorityClassName .Values.global.priorityClassName }}
29-
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
28+
{{- if or .Values.priorityClassName .Values.global.monitoringPriorityClassName }}
29+
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.monitoringPriorityClassName }}
3030
{{- end }}
3131
{{- if ( or .Values.persistence.enabled .Values.dashboards .Values.sidecar.notifiers.enabled .Values.extraInitContainers) }}
3232
initContainers:

resources/monitoring/charts/grafana/templates/image-renderer-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ spec:
5151
hostAliases:
5252
{{ toYaml .Values.imageRenderer.hostAliases | indent 2 }}
5353
{{- end }}
54-
{{- if or .Values.imageRenderer.priorityClassName .Values.global.priorityClassName }}
55-
priorityClassName: {{ coalesce .Values.imageRenderer.priorityClassName .Values.global.priorityClassName }}
54+
{{- if or .Values.imageRenderer.priorityClassName .Values.global.monitoringPriorityClassName }}
55+
priorityClassName: {{ coalesce .Values.imageRenderer.priorityClassName .Values.global.monitoringPriorityClassName }}
5656
{{- end }}
5757
{{- if .Values.imageRenderer.image.pullSecrets }}
5858
imagePullSecrets:

resources/monitoring/charts/grafana/templates/kyma-additions/auth-proxy-deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ spec:
3434
configMap:
3535
name: {{ .Release.Name }}-auth-proxy-{{ template "grafana.name" . }}-templates
3636
serviceAccountName: {{ .Release.Name }}-auth-proxy-{{ template "grafana.name" . }}
37-
{{- if or .Values.priorityClassName .Values.global.priorityClassName }}
38-
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
37+
{{- if or .Values.priorityClassName .Values.global.monitoringPriorityClassName }}
38+
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.monitoringPriorityClassName }}
3939
{{- end }}
4040
{{- if .Values.kyma.authProxy.securityContext }}
4141
securityContext:

resources/monitoring/charts/prometheus-istio/templates/deploy.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ spec:
3939
{{ toYaml .Values.server.podLabels | nindent 8 }}
4040
{{- end}}
4141
spec:
42-
{{- if or .Values.server.priorityClassName .Values.global.priorityClassName }}
43-
priorityClassName: "{{ coalesce .Values.server.priorityClassName .Values.global.priorityClassName }}"
42+
{{- if or .Values.server.priorityClassName .Values.global.monitoringPriorityClassName }}
43+
priorityClassName: "{{ coalesce .Values.server.priorityClassName .Values.global.monitoringPriorityClassName }}"
4444
{{- end }}
4545
{{- if .Values.server.schedulerName }}
4646
schedulerName: "{{ .Values.server.schedulerName }}"

resources/monitoring/charts/prometheus-istio/templates/sts.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ spec:
3939
{{ toYaml .Values.server.podLabels | nindent 8 }}
4040
{{- end}}
4141
spec:
42-
{{- if or .Values.server.priorityClassName .Values.global.priorityClassName }}
43-
priorityClassName: "{{ coalesce .Values.server.priorityClassName .Values.global.priorityClassName }}"
42+
{{- if or .Values.server.priorityClassName .Values.global.monitoringPriorityClassName }}
43+
priorityClassName: "{{ coalesce .Values.server.priorityClassName .Values.global.monitoringPriorityClassName }}"
4444
{{- end }}
4545
{{- if .Values.server.schedulerName }}
4646
schedulerName: "{{ .Values.server.schedulerName }}"

resources/monitoring/charts/prometheus-node-exporter/templates/daemonset.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ spec:
3232
securityContext:
3333
{{ toYaml .Values.securityContext | indent 8 }}
3434
{{- end }}
35-
{{- if or .Values.priorityClassName .Values.global.highPriorityClassName }}
36-
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.highPriorityClassName }}
35+
{{- if or .Values.priorityClassName .Values.global.monitoringHighPriorityClassName }}
36+
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.monitoringHighPriorityClassName }}
3737
{{- end }}
3838
{{- if .Values.extraInitContainers }}
3939
initContainers:
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: scheduling.k8s.io/v1
2+
kind: PriorityClass
3+
metadata:
4+
name: {{ .Values.global.monitoringHighPriorityClassName }}
5+
value: 2100000
6+
globalDefault: false
7+
description: "Global scheduling priority of Monitoring DaemonSet components. Must not be blocked by unschedulable non-daemonset workloads."
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
apiVersion: scheduling.k8s.io/v1
2+
kind: PriorityClass
3+
metadata:
4+
name: {{ .Values.global.monitoringPriorityClassName }}
5+
value: 2000000
6+
globalDefault: false
7+
description: "Global (default) scheduling priority of Kyma components. Must not be blocked by unschedulable user workloads."

resources/monitoring/templates/prometheus-operator/deployment.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ spec:
3939
{{ toYaml .Values.prometheusOperator.podAnnotations | indent 8 }}
4040
{{- end }}
4141
spec:
42-
{{- if or .Values.prometheusOperator.priorityClassName .Values.global.priorityClassName }}
43-
priorityClassName: {{ coalesce .Values.prometheusOperator.priorityClassName .Values.global.priorityClassName }}
42+
{{- if or .Values.prometheusOperator.priorityClassName .Values.global.monitoringPriorityClassName }}
43+
priorityClassName: {{ coalesce .Values.prometheusOperator.priorityClassName .Values.global.monitoringPriorityClassName }}
4444
{{- end }}
4545
containers:
4646
- name: {{ template "kube-prometheus-stack.name" . }}

resources/monitoring/templates/prometheus/prometheus.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -301,8 +301,8 @@ spec:
301301
initContainers:
302302
{{ toYaml .Values.prometheus.prometheusSpec.initContainers | indent 4 }}
303303
{{- end }}
304-
{{- if or .Values.prometheus.prometheusSpec.priorityClassName .Values.global.priorityClassName }}
305-
priorityClassName: {{ coalesce .Values.prometheus.prometheusSpec.priorityClassName .Values.global.priorityClassName }}
304+
{{- if or .Values.prometheus.prometheusSpec.priorityClassName .Values.global.monitoringPriorityClassName }}
305+
priorityClassName: {{ coalesce .Values.prometheus.prometheusSpec.priorityClassName .Values.global.monitoringPriorityClassName }}
306306
{{- end }}
307307
{{- if .Values.prometheus.prometheusSpec.thanos }}
308308
thanos:

resources/monitoring/values.yaml

+2-1
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,8 @@ global:
192192
# - "image-pull-secret"
193193

194194

195-
highPriorityClassName: "kyma-system-priority"
195+
monitoringHighPriorityClassName: "monitoring-priority-class-high"
196+
monitoringPriorityClassName: "monitoring-priority-class"
196197

197198
# disable slack and victorops alerting by default
198199
alertTools:

resources/telemetry/charts/operator/templates/deployment.yaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ spec:
2121
spec:
2222
serviceAccountName: {{ include "operator.serviceAccountName" . }}
2323
terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
24-
{{- if or .Values.priorityClassName .Values.global.priorityClassName }}
25-
priorityClassName: {{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
24+
{{- if .Values.priorityClassName }}
25+
priorityClassName: {{ .Values.priorityClassName }}
2626
{{- end }}
2727
securityContext:
2828
{{- toYaml .Values.podSecurityContext | nindent 8 }}
@@ -44,8 +44,8 @@ spec:
4444
- --fluent-bit-exporter-image={{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.directory_size_exporter) }}
4545
- --validating-webhook-enabled={{ .Values.webhook.enabled }}
4646
- --enable-telemetry-manager-module=false
47-
{{- if or .Values.highPriorityClassName .Values.global.highPriorityClassName }}
48-
- --fluent-bit-priority-class-name={{ coalesce .Values.highPriorityClassName .Values.global.highPriorityClassName }}
47+
{{- if .Values.highPriorityClassName }}
48+
- --fluent-bit-priority-class-name={{ .Values.highPriorityClassName }}
4949
{{- end }}
5050
{{- if not .Values.controllers.logging.enabled }}
5151
- --enable-logging=false
@@ -55,15 +55,15 @@ spec:
5555
{{- else }}
5656
- --enable-tracing=true
5757
- --trace-collector-image={{ include "imageurl" (dict "reg" .Values.global.containerRegistry "img" .Values.global.images.telemetry_otel_collector) }}
58-
{{- if or .Values.priorityClassName .Values.global.priorityClassName }}
59-
- --trace-collector-priority-class={{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
58+
{{- if .Values.priorityClassName }}
59+
- --trace-collector-priority-class={{ .Values.priorityClassName }}
6060
{{- end }}
6161
{{- end }}
6262
{{- if not .Values.controllers.metrics.enabled }}
6363
- --enable-metrics=false
6464
{{- else }}
65-
{{- if or .Values.priorityClassName .Values.global.priorityClassName }}
66-
- --metric-gateway-priority-class={{ coalesce .Values.priorityClassName .Values.global.priorityClassName }}
65+
{{- if .Values.priorityClassName }}
66+
- --metric-gateway-priority-class={{ .Values.priorityClassName }}
6767
{{- end }}
6868
{{- end }}
6969
name: manager

0 commit comments

Comments
 (0)