nameoverride

FIWARE-Ops · Jul 19, 2024 · fb68081 · fb68081
1 parent 9719fce
commit fb68081
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/aws/didymosxr/nginx/templates/_helpers.tpl b/aws/didymosxr/nginx/templates/_helpers.tpl
@@ -2,7 +2,7 @@
 Expand the name of the chart.
 */}}
 {{- define "nginx.name" -}}
-{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" }}
+{{- default .Chart.Name .Values.nginx.nameOverride | trunc 63 | trimSuffix "-" }}
 {{- end }}
 
 {{/*
@@ -11,10 +11,10 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this
 If release name contains chart name it will be used as a full name.
 */}}
 {{- define "nginx.fullname" -}}
-{{- if .Values.fullnameOverride }}
-{{- .Values.fullnameOverride | trunc 63 | trimSuffix "-" }}
+{{- if .Values.nginx.fullnameOverride }}
+{{- .Values.nginx.fullnameOverride | trunc 63 | trimSuffix "-" }}
 {{- else }}
-{{- $name := default .Chart.Name .Values.nameOverride }}
+{{- $name := default .Chart.Name .Values.nginx.nameOverride }}
 {{- if contains $name .Release.Name }}
 {{- .Release.Name | trunc 63 | trimSuffix "-" }}
 {{- else }}

diff --git a/aws/didymosxr/nginx/templates/route.yaml b/aws/didymosxr/nginx/templates/route.yaml
@@ -15,7 +15,7 @@ spec:
   host: {{ .Values.nginx.route.host }}
   to:
     kind: Service
-    name: {{ $fullName }}
+    name: {{ include "nginx.fullname" . }}
   {{- if .Values.nginx.route.tls }}
   tls:
   {{- with .Values.nginx.route.tls }}

diff --git a/aws/didymosxr/nginx/values.yaml b/aws/didymosxr/nginx/values.yaml
@@ -1,4 +1,5 @@
 nginx:
+  fullnameOverride: didymosxr-nginx
   service:
     type: ClusterIP
   route: