From 0a7174cb40cae95c7435e569c17f7d9867d0870a Mon Sep 17 00:00:00 2001 From: Lindsay Landry Date: Thu, 8 Jan 2026 15:54:43 -0600 Subject: [PATCH 1/3] add chart values --- charts/service/Chart.yaml | 2 +- charts/service/ci/custom-values.yaml | 5 -- charts/service/templates/cronjob.yaml | 27 ++-------- charts/service/templates/deployment.yaml | 52 +++---------------- charts/service/templates/jobs.yaml | 31 ++--------- charts/service/templates/pre-release-job.yaml | 34 +++--------- charts/service/values.yaml | 1 - 7 files changed, 19 insertions(+), 133 deletions(-) diff --git a/charts/service/Chart.yaml b/charts/service/Chart.yaml index d1fb46a..e786c94 100644 --- a/charts/service/Chart.yaml +++ b/charts/service/Chart.yaml @@ -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 diff --git a/charts/service/ci/custom-values.yaml b/charts/service/ci/custom-values.yaml index e5aef16..1e0b3ab 100644 --- a/charts/service/ci/custom-values.yaml +++ b/charts/service/ci/custom-values.yaml @@ -170,11 +170,6 @@ persistentVolumeClaims: name: standard storage: 1Gi -datadog: - service: foobar - version: foo - env: bar - otel: service: foobar version: foo diff --git a/charts/service/templates/cronjob.yaml b/charts/service/templates/cronjob.yaml index 9685355..354056d 100644 --- a/charts/service/templates/cronjob.yaml +++ b/charts/service/templates/cronjob.yaml @@ -6,7 +6,6 @@ {{- $imagePullPolicy := .Values.image.imagePullPolicy -}} {{- $parentEnvKeyValue := .Values.envKeyValue -}} {{- $parentEnv := .Values.env -}} -{{- $datadog := .Values.datadog -}} {{- $otel := .Values.otel -}} {{- range .Values.cronJobs }} --- @@ -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 }} @@ -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: diff --git a/charts/service/templates/deployment.yaml b/charts/service/templates/deployment.yaml index e10a2b9..d39e683 100644 --- a/charts/service/templates/deployment.yaml +++ b/charts/service/templates/deployment.yaml @@ -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 }} @@ -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: @@ -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: @@ -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: diff --git a/charts/service/templates/jobs.yaml b/charts/service/templates/jobs.yaml index 4d349a9..f002f3b 100644 --- a/charts/service/templates/jobs.yaml +++ b/charts/service/templates/jobs.yaml @@ -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 -}} @@ -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: @@ -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 diff --git a/charts/service/templates/pre-release-job.yaml b/charts/service/templates/pre-release-job.yaml index c74fec1..387e924 100644 --- a/charts/service/templates/pre-release-job.yaml +++ b/charts/service/templates/pre-release-job.yaml @@ -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 @@ -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 @@ -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: diff --git a/charts/service/values.yaml b/charts/service/values.yaml index aa43132..c237860 100644 --- a/charts/service/values.yaml +++ b/charts/service/values.yaml @@ -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 From dba37b20c5405439ef07d1843072220b7f3356ce Mon Sep 17 00:00:00 2001 From: Lindsay Landry Date: Mon, 12 Jan 2026 14:33:26 -0600 Subject: [PATCH 2/3] update chart-testing version --- .github/workflows/lint-test.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index ba5cfaa..852dc3d 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -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 From b1878fc6955b3305c5f884939cb258e9c74c3c1c Mon Sep 17 00:00:00 2001 From: Lindsay Landry Date: Mon, 12 Jan 2026 14:35:03 -0600 Subject: [PATCH 3/3] fix version --- .github/workflows/lint-test.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml index 852dc3d..00e3e0e 100644 --- a/.github/workflows/lint-test.yaml +++ b/.github/workflows/lint-test.yaml @@ -21,7 +21,7 @@ jobs: python-version: "3.x" - name: Set up chart-testing - uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f# v2.8.0 + uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # v2.8.0 - name: Run chart-testing (list-changed) id: list-changed