Skip to content

Commit c06d1a2

Browse files
VietND96VietND96
authored
K8s: Helm config customLabels to add more tracing resource attributes (#2858)
Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
1 parent 434221c commit c06d1a2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

56 files changed

+79
-190
lines changed

‎charts/selenium-grid/CONFIGURATION.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -682,7 +682,7 @@ A Helm chart for creating a Selenium Grid Server in Kubernetes
682682
| videoRecorder.extraVolumeMounts | list | `[]` | Custom video recorder back-end scripts (video.sh, video_ready.py, etc.) further by ConfigMap. NOTE: For the mount point with the name "video", or "video-scripts", it will override the default. For other names, it will be appended. |
683683
| videoRecorder.extraVolumes | list | `[]` | Extra volumes for video recorder pod |
684684
| videoRecorder.s3 | object | `{"args":[],"command":[],"extraEnvironmentVariables":[],"imageName":"aws-cli","imagePullPolicy":"IfNotPresent","imageRegistry":"bitnami","imageTag":"latest","securityContext":{"runAsUser":0}}` | Container spec for the uploader if above it is defined as "uploader.name: s3" |
685-
| customLabels | object | `{}` | Custom labels for k8s resources |
685+
| customLabels | object | `{}` | Add more labels to all resources created by this chart or override existing label keys |
686686
| videoManager.enabled | bool | `false` | Enable video manager |
687687
| videoManager.nameOverride | string | `""` | Override deployment name of video manager |
688688
| videoManager.ingress.enabled | bool | `true` | Enable ingress resource to access the file browser |

‎charts/selenium-grid/templates/_helpers.tpl‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,10 @@ template:
304304
labels:
305305
app: {{ .name }}
306306
app.kubernetes.io/name: {{ .name }}
307-
{{- include "seleniumGrid.commonLabels" . | nindent 6 }}
307+
{{- include "seleniumGrid.commonLabels" $ | nindent 6 }}
308308
{{- with .node.labels }}
309309
{{- toYaml . | nindent 6 }}
310310
{{- end }}
311-
{{- with $.Values.customLabels }}
312-
{{- toYaml . | nindent 6 }}
313-
{{- end }}
314311
annotations:
315312
checksum/event-bus-configmap: {{ include (print $.Template.BasePath "/event-bus-configmap.yaml") . | sha256sum }}
316313
checksum/node-configmap: {{ include (print $.Template.BasePath "/node-configmap.yaml") . | sha256sum }}
@@ -398,6 +395,8 @@ template:
398395
{{- end }}
399396
- name: SE_OTEL_SERVICE_NAME
400397
value: {{ .name | quote }}
398+
- name: SE_OTEL_RESOURCE_ATTRIBUTES
399+
value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
401400
- name: SE_NODE_HOST
402401
valueFrom:
403402
fieldRef:

‎charts/selenium-grid/templates/_nameHelpers.tpl‎

Lines changed: 22 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,28 @@ Create chart name and version as used by the chart label.
3232
Common labels
3333
*/}}
3434
{{- define "seleniumGrid.commonLabels" -}}
35-
app.kubernetes.io/managed-by: {{ .Release.Service | lower }}
36-
app.kubernetes.io/instance: {{ .Release.Name }}
37-
app.kubernetes.io/version: {{ .Chart.AppVersion }}
38-
app.kubernetes.io/component: {{ printf "selenium-grid-%s" .Chart.AppVersion }}
39-
helm.sh/chart: {{ include "seleniumGrid.chart" . }}
35+
{{- $defaultLabels := dict
36+
"app.kubernetes.io/managed-by" (.Release.Service | lower)
37+
"app.kubernetes.io/instance" .Release.Name
38+
"app.kubernetes.io/version" .Chart.AppVersion
39+
"app.kubernetes.io/component" (printf "selenium-grid-%s" .Chart.AppVersion)
40+
"helm.sh/chart" (include "seleniumGrid.chart" .)
41+
}}
42+
{{- $customLabels := tpl (toYaml (.Values.customLabels | default dict)) $ | fromYaml }}
43+
{{- $mergedLabels := merge $defaultLabels $customLabels }}
44+
{{- toYaml $mergedLabels | nindent 0 }}
45+
{{- end -}}
46+
47+
{{/*
48+
Bring common labels to tracing resource attributes
49+
*/}}
50+
{{- define "seleniumGrid.tracing.attributes" -}}
51+
{{- $labels := include "seleniumGrid.commonLabels" $ | fromYaml }}
52+
{{- $attrs := list }}
53+
{{- range $k, $v := $labels }}
54+
{{- $attrs = append $attrs (printf "%s=%s" $k $v) }}
55+
{{- end }}
56+
{{- join "," $attrs }}
4057
{{- end -}}
4158

4259
{{/*

‎charts/selenium-grid/templates/basic-auth-secret.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@ metadata:
99
{{- end }}
1010
labels:
1111
{{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
12-
{{- with .Values.customLabels }}
13-
{{- toYaml . | nindent 4 }}
14-
{{- end }}
1512
type: Opaque
1613
data:
1714
{{- if eq .Values.basicAuth.enabled true }}

‎charts/selenium-grid/templates/chrome-node-deployment.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ metadata:
1313
{{- with $nodeConfig.labels }}
1414
{{- toYaml . | nindent 4 }}
1515
{{- end }}
16-
{{- with $.Values.customLabels }}
17-
{{- toYaml . | nindent 4 }}
18-
{{- end }}
1916
spec:
2017
strategy:
2118
{{- template "seleniumGrid.updateStrategy" (list $nodeConfig $.Values.global.seleniumGrid) }}

‎charts/selenium-grid/templates/chrome-node-hpa.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,6 @@ metadata:
1717
{{- with $nodeConfig.labels }}
1818
{{- toYaml . | nindent 4 }}
1919
{{- end }}
20-
{{- with $.Values.customLabels }}
21-
{{- toYaml . | nindent 4 }}
22-
{{- end }}
2320
spec:
2421
{{- $podScope := deepCopy $ -}}
2522
{{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" (list $nodeConfig $)) -}}

‎charts/selenium-grid/templates/chrome-node-scaledjobs.yaml‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,6 @@ metadata:
2020
{{- with $nodeConfig.labels }}
2121
{{- toYaml . | nindent 4 }}
2222
{{- end }}
23-
{{- with $.Values.customLabels }}
24-
{{- toYaml . | nindent 4 }}
25-
{{- end }}
2623
spec:
2724
{{- $podScope := deepCopy $ -}}
2825
{{- $_ := set $podScope "name" (include "seleniumGrid.chromeNode.fullname" (list $nodeConfig $)) -}}

‎charts/selenium-grid/templates/distributor-configmap.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ metadata:
77
annotations: {{- toYaml . | nindent 4 }}
88
{{- end }}
99
labels:
10-
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
11-
{{- with .Values.customLabels }}
12-
{{- toYaml . | nindent 4 }}
13-
{{- end }}
10+
{{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
1411
data:
1512
{{- $fileProceeded := list -}}
1613
{{- range $path, $_ := .Files.Glob $.Values.distributorConfigMap.extraScriptsImportFrom }}

‎charts/selenium-grid/templates/distributor-deployment.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ metadata:
77
labels: &distributor_labels
88
app: {{ template "seleniumGrid.distributor.fullname" . }}
99
app.kubernetes.io/name: {{ template "seleniumGrid.distributor.fullname" . }}
10-
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
11-
{{- with .Values.customLabels }}
12-
{{- toYaml . | nindent 4 }}
13-
{{- end }}
10+
{{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
1411
spec:
1512
strategy:
1613
{{- template "seleniumGrid.updateStrategy" (list $.Values.components.distributor $.Values.global.seleniumGrid) }}
@@ -49,6 +46,8 @@ spec:
4946
fieldPath: status.hostIP
5047
- name: SE_OTEL_SERVICE_NAME
5148
value: '{{ template "seleniumGrid.distributor.fullname" . }}'
49+
- name: SE_OTEL_RESOURCE_ATTRIBUTES
50+
value: {{ include "seleniumGrid.tracing.attributes" $ | quote }}
5251
- name: SE_DISTRIBUTOR_HOST
5352
valueFrom:
5453
fieldRef:

‎charts/selenium-grid/templates/distributor-service.yaml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@ metadata:
66
namespace: {{ .Release.Namespace }}
77
labels:
88
app: {{ template "seleniumGrid.distributor.fullname" . }}
9-
{{- include "seleniumGrid.commonLabels" . | nindent 4 }}
10-
{{- with .Values.customLabels }}
11-
{{- toYaml . | nindent 4 }}
12-
{{- end }}
9+
{{- include "seleniumGrid.commonLabels" $ | nindent 4 }}
1310
{{- with .Values.components.distributor.serviceAnnotations }}
1411
annotations: {{- toYaml . | nindent 4 }}
1512
{{- end }}

0 commit comments

Comments
 (0)