From 3e91e96ea194426cc52cce2b45be2ad6a3cc02bd Mon Sep 17 00:00:00 2001
From: Josh Sizer <joshsizer@gmail.com>
Date: Sat, 9 Mar 2024 16:03:12 -0500
Subject: [PATCH] fix: use .Values.service.name
---
templates/ingress.yaml | 2 +-
templates/service.yaml | 6 +-----
values.yaml | 2 +-
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/templates/ingress.yaml b/templates/ingress.yaml
index cb90c2f..a890a1a 100644
--- 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
index 6cdc67f..9211481 100644
--- 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
index c077dfa..a40f636 100644
--- a/values.yaml
+++ b/values.yaml
@@ -26,7 +26,7 @@ image:
deployment: {}
# annotations:
service:
- name: ""
+ name: ""
type: ClusterIP
# sessionAffinity: None
# sessionAffinityConfig: {}
--
GitLab