Update _helpers.tpl

OT-CONTAINER-KIT · Jun 25, 2024 · 533a1c2 · 533a1c2
1 parent e05c963
commit 533a1c2
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/charts/microservice/templates/_helpers.tpl b/charts/microservice/templates/_helpers.tpl
@@ -1,18 +1,15 @@
 {{- define "microservice.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" -}}
+{{- .Chart.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
 
 {{- define "microservice.fullname" -}}
-{{- $name := include "microservice.name" . -}}
-{{- if .Values.fullnameOverride -}}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" -}}
-{{- else -}}
-{{- printf "%s-%s" $name .Release.Name | trunc 63 | trimSuffix "-" -}}
-{{- end -}}
+{{- printf "%s-%s" (include "microservice.name" .) .Release.Name | trunc 63 | trimSuffix "-" -}}
 {{- end -}}
+
 {{- define "microservice.labels" -}}
-  app: {{ include "microservice.name" . }}
+app: {{ include "microservice.name" . }}
 {{- end -}}
+
 {{- define "microservice.selectorLabels" -}}
-  app: {{ include "microservice.name" . }}
+app: {{ include "microservice.name" . }}
 {{- end -}}