Skip to content

Commit d5398b7

Browse files
authored
fix(chart): pod labels and annotations for patch-scaledobjects (#2274)
Signed-off-by: Viet Nguyen Duc <[email protected]>
1 parent f2280e9 commit d5398b7

File tree

2 files changed

+12
-15
lines changed

2 files changed

+12
-15
lines changed

Diff for: charts/selenium-grid/templates/patch-keda/patch-keda-objects-job.yaml

+12-9
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ kind: Job
44
metadata:
55
name: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
66
namespace: {{ .Release.Namespace }}
7-
annotations:
8-
{{- with $.Values.autoscaling.patchObjectFinalizers.annotations }}
9-
{{- toYaml . | nindent 4 }}
10-
{{- end }}
11-
labels:
12-
deploymentName: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
7+
annotations: &patch_objects_job_annotations
8+
{{- with $.Values.autoscaling.patchObjectFinalizers.annotations }}
9+
{{- toYaml . | nindent 4 }}
10+
{{- end }}
11+
labels: &patch_objects_job_labels
12+
app: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
13+
app.kubernetes.io/name: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
1314
{{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
14-
{{- with $.Values.customLabels }}
15-
{{- toYaml . | nindent 4 }}
16-
{{- end }}
15+
{{- with $.Values.customLabels }}
16+
{{- toYaml . | nindent 4 }}
17+
{{- end }}
1718
spec:
1819
template:
1920
metadata:
21+
labels: *patch_objects_job_labels
22+
annotations: *patch_objects_job_annotations
2023
name: {{ template "seleniumGrid.keda.patchObjectsJob.fullname" $ }}
2124
spec:
2225
activeDeadlineSeconds: {{ $.Values.autoscaling.patchObjectFinalizers.activeDeadlineSeconds }}

Diff for: tests/charts/ci/base-resources-values.yaml

-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
components:
22
router:
3-
livenessProbe:
4-
failureThreshold: 6
53
resources:
64
requests:
75
cpu: 100m
@@ -10,8 +8,6 @@ components:
108
cpu: 500m
119
memory: 2500Mi
1210
distributor:
13-
livenessProbe:
14-
failureThreshold: 6
1511
resources:
1612
requests:
1713
cpu: "1"
@@ -45,8 +41,6 @@ components:
4541
memory: 512Mi
4642

4743
hub:
48-
livenessProbe:
49-
failureThreshold: 6
5044
resources:
5145
requests:
5246
cpu: "1"

0 commit comments

Comments
 (0)