fix: use .Values.service.name

twuni · Mar 9, 2024 · d0cfcca · d0cfcca
1 parent c019755
commit d0cfcca
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $apiVersions := .Capabilities.APIVersions -}}
-{{- $serviceName := include "docker-registry.fullname" . -}}
+{{- $serviceName := .Values.service.name | default (include "docker-registry.fullname" .) -}}
 {{- $servicePort := .Values.service.port -}}
 {{- $path := .Values.ingress.path -}}
 apiVersion: {{- if $apiVersions.Has "networking.k8s.io/v1" }} networking.k8s.io/v1 {{- else }} networking.k8s.io/v1beta1 {{- end }}

diff --git a/templates/service.yaml b/templates/service.yaml
@@ -1,11 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-{{- if .Values.service.name }}
-  name: {{ .Values.service.name }}
-{{- else }}
-  name: {{ template "docker-registry.fullname" . }}
-{{- end }}
+  name: {{ .Values.service.name | default (include "docker-registry.fullname" .) }}
   namespace: {{ .Values.namespace | default .Release.Namespace }}
   labels:
     app: {{ template "docker-registry.name" . }}

diff --git a/values.yaml b/values.yaml
@@ -24,7 +24,7 @@ image:
 # imagePullSecrets:
     # - name: docker
 service:
-  name: "" 
+  name: ""
   type: ClusterIP
   # sessionAffinity: None
   # sessionAffinityConfig: {}