fix: tags.datadoghq.com/env value 문제 우선순위 수정 (#11)

Co-authored-by: kty1965 <[email protected]>
modusign · Jan 22, 2024 · fee8c11 · fee8c11
1 parent d6d8f9b
commit fee8c11
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/charts/application-template/Chart.yaml b/charts/application-template/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 - name: modusign
   url: https://github.com/modusign
 name: application-template
-version: 1.3.0
+version: 1.3.1
diff --git a/charts/application-template/README.md b/charts/application-template/README.md
@@ -1,6 +1,6 @@
 # application-template
 
-![Version: 1.3.0](https://img.shields.io/badge/Version-1.3.0-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 1.3.1](https://img.shields.io/badge/Version-1.3.1-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 A Helm chart for Modusign Applications
 

diff --git a/charts/application-template/templates/_helpers.tpl b/charts/application-template/templates/_helpers.tpl
@@ -54,7 +54,7 @@ env: {{ .Values.global.runtimeEnv | default "stage" }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- if .Values.global.observability.datadog.admissionController.enabled }}
-tags.datadoghq.com/env: {{ .Values.global.env.DD_ENV | .Values.global.runtimeEnv | default "stage" }}
+tags.datadoghq.com/env: {{ coalesce .Values.global.env.DD_ENV .Values.global.runtimeEnv "stage" }}
 tags.datadoghq.com/service: {{ .Release.Name }}
 tags.datadoghq.com/version: {{ .Values.global.image.tag | quote }}
 {{- end }}

diff --git a/charts/cronjob-template/Chart.yaml b/charts/cronjob-template/Chart.yaml
@@ -9,4 +9,4 @@ maintainers:
 - name: modusign
   url: https://github.com/modusign
 name: cronjob-template
-version: 1.1.0
+version: 1.1.1
diff --git a/charts/cronjob-template/README.md b/charts/cronjob-template/README.md
@@ -1,6 +1,6 @@
 # cronjob-template
 
-![Version: 1.1.0](https://img.shields.io/badge/Version-1.1.0-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
+![Version: 1.1.1](https://img.shields.io/badge/Version-1.1.1-informational?style=flat-square) ![AppVersion: v1.0.0](https://img.shields.io/badge/AppVersion-v1.0.0-informational?style=flat-square)
 
 A Helm chart for CronJob
 

diff --git a/charts/cronjob-template/templates/_helpers.tpl b/charts/cronjob-template/templates/_helpers.tpl
@@ -24,7 +24,7 @@ env: {{ .Values.runtimeEnv | default "stage" }}
 app.kubernetes.io/instance: {{ .Release.Name }}
 app.kubernetes.io/part-of: {{ .Release.Name }}
 {{- if .Values.observability.datadog.admissionController.enabled }}
-tags.datadoghq.com/env: {{ .Values.env.DD_ENV | .Values.runtimeEnv | default "stage" }}
+tags.datadoghq.com/env: {{ coalesce .Values.env.DD_ENV .Values.runtimeEnv "stage" }}
 tags.datadoghq.com/service: {{ .Release.Name }}
 tags.datadoghq.com/version: {{ .Values.image.tag | quote }}
 {{- end }}