Skip to content

add generic describing labels for log search #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lindsaylandry merged 3 commits into from
Jan 12, 2026
Merged

add generic describing labels for log search #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0a7174c
add chart values
Jan 8, 2026
dba37b2
update chart-testing version
Jan 12, 2026
b1878fc
fix version
Jan 12, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions .github/workflows/lint-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,7 @@ jobs:
python-version: "3.x"

- name: Set up chart-testing
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
with:
version: v3.12.0
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0

- name: Run chart-testing (list-changed)
id: list-changed
Expand Down
2 changes: 1 addition & 1 deletion charts/service/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apiVersion: v2
name: service
description: A generic k8s service chart
type: application
version: 1.8.21
version: 1.9.0
maintainers:
- email: devops@codecademy.com
name: devops
5 changes: 0 additions & 5 deletions charts/service/ci/custom-values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,11 +170,6 @@ persistentVolumeClaims:
name: standard
storage: 1Gi

datadog:
service: foobar
version: foo
env: bar

otel:
service: foobar
version: foo
Expand Down
27 changes: 3 additions & 24 deletions charts/service/templates/cronjob.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
{{- $imagePullPolicy := .Values.image.imagePullPolicy -}}
{{- $parentEnvKeyValue := .Values.envKeyValue -}}
{{- $parentEnv := .Values.env -}}
{{- $datadog := .Values.datadog -}}
{{- $otel := .Values.otel -}}
{{- range .Values.cronJobs }}
---
Expand All @@ -22,15 +21,13 @@ spec:
template:
metadata:
labels:
{{- with $datadog }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- with $otel }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
spec:
serviceAccountName: {{ $serviceAccountName }}
Expand All @@ -51,24 +48,6 @@ spec:
{{- with .env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with $datadog }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: DD_ENV
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/env']
- name: DD_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/service']
- name: DD_VERSION
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/version']
{{- end }}
{{- with $otel }}
- name: OTEL_AGENT_HOST
valueFrom:
Expand Down
52 changes: 6 additions & 46 deletions charts/service/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ metadata:
name: {{ include "service.fullname" . }}
labels:
{{- include "service.labels" . | nindent 4 }}
{{- with .Values.datadog }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- with .Values.otel }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
spec:
replicas: {{ .Values.replicaCount }}
Expand Down Expand Up @@ -46,15 +44,13 @@ spec:
{{- with .Values.podLabels }}
{{- toYaml . | nindent 8 }}
{{- end }}
{{- with .Values.datadog }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- with .Values.otel }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
{{- with .Values.annotations }}
annotations:
Expand Down Expand Up @@ -91,24 +87,6 @@ spec:
{{- with .Values.initContainer.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.datadog }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: DD_ENV
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/env']
- name: DD_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/service']
- name: DD_VERSION
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/version']
{{- end }}
{{- with .Values.otel }}
- name: OTEL_AGENT_HOST
valueFrom:
Expand Down Expand Up @@ -162,24 +140,6 @@ spec:
name: {{ .Values.envFromSecret }}
{{- end }}
env:
{{- with .Values.datadog }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: DD_ENV
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/env']
- name: DD_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/service']
- name: DD_VERSION
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/version']
{{- end }}
{{- with .Values.otel }}
- name: OTEL_AGENT_HOST
valueFrom:
Expand Down
31 changes: 3 additions & 28 deletions charts/service/templates/jobs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{{- $image := .Values.image.repository -}}
{{- $tag := .Values.image.tag -}}
{{- $imagePullPolicy := .Values.image.pullPolicy -}}
{{- $datadog := .Values.datadog -}}
{{- $otel := .Values.otel -}}
{{- $securityContext := .Values.securityContext -}}
{{- $parentEnvKeyValue := .Values.envKeyValue -}}
Expand All @@ -19,18 +18,14 @@ spec:
template:
metadata:
labels:
{{- with $datadog }}
{{- if and .service .env }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- end }}
{{- with $otel }}
{{- if and .service .env }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
{{- end }}
spec:
Expand All @@ -53,26 +48,6 @@ spec:
{{- with .env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with $datadog }}
{{- if and .service .env }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: DD_ENV
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/env']
- name: DD_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/service']
- name: DD_VERSION
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/version']
{{- end }}
{{- end }}
{{- with $otel }}
{{- if and .service .env }}
- name: OTEL_AGENT_HOST
Expand Down
34 changes: 6 additions & 28 deletions charts/service/templates/pre-release-job.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@ metadata:
name: {{ include "service.fullname" . }}-pre-release-job
labels:
{{- include "service.labels" . | nindent 4 }}
{{- with .Values.datadog }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- with .Values.otel }}
opentelemetry/env: {{ .env }}
opentelemetry/service: {{ .service }}
opentelemetry/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
annotations:
"helm.sh/hook": pre-upgrade,pre-install
Expand All @@ -27,15 +25,13 @@ spec:
metadata:
name: {{ include "service.fullname" . }}-pre-release-job
labels:
{{- with .Values.datadog }}
tags.datadoghq.com/env: {{ .env }}
tags.datadoghq.com/service: {{ .service }}
tags.datadoghq.com/version: {{ .version | quote }}
{{- end }}
{{- with .Values.otel }}
opentelemetry/env: {{ .env }}
opentelemetry/service: {{ .service }}
opentelemetry/version: {{ .version | quote }}
environment: {{ .env }}
service: {{ .service }}
version: {{ .version | quote }}
{{- end }}
spec:
restartPolicy: Never
Expand All @@ -53,24 +49,6 @@ spec:
{{- with .Values.preReleaseJob.env }}
{{- toYaml . | nindent 12 }}
{{- end }}
{{- with .Values.datadog }}
- name: DD_AGENT_HOST
valueFrom:
fieldRef:
fieldPath: status.hostIP
- name: DD_ENV
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/env']
- name: DD_SERVICE
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/service']
- name: DD_VERSION
valueFrom:
fieldRef:
fieldPath: metadata.labels['tags.datadoghq.com/version']
{{- end }}
{{- with .Values.otel }}
- name: OTEL_AGENT_HOST
valueFrom:
Expand Down
1 change: 0 additions & 1 deletion charts/service/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,6 @@ serviceAccount:
# If not set and enabled is true, a name is generated using the fullname template
name: ""

datadog: {}
otel: {}
# env: production
# service: service_name
Expand Down
Loading