refactor: change names and fix LB/Ingress bug in service.yaml

Author: pmoscode

templates/ingress.yaml

@@ -49,7 +49,7 @@ spec:
             backend:
               {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
               service:
-                name: {{ $fullName }}-headless
+                name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
               {{- else }}

templates/service-headless.yaml templates/service-LB.yamltemplates/service-headless.yaml renamed to templates/service-LB.yaml

@@ -1,19 +1,17 @@
+{{- if and (eq .Values.service.type "LoadBalancer") (.Values.ingress.enabled) }}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "emby.fullname" . }}-headless
+  name: {{ include "emby.fullname" . }}-LB
   labels:
     {{- include "emby.labels" . | nindent 4 }}
 spec:
-  {{- if eq .Values.service.type "LoadBalancer" }}
-  type: ClusterIP
-  {{- else }}
-  type: {{ .Values.service.type }}
-  {{- end }}
+  type: LoadBalancer
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
   selector:
     {{- include "emby.selectorLabels" . | nindent 4 }}
+{{- end }}

templates/service.yaml

@@ -1,17 +1,19 @@
-{{- if and (eq .Values.service.type "LoadBalancer") (.Values.ingress.enabled) }}
 apiVersion: v1
 kind: Service
 metadata:
   name: {{ include "emby.fullname" . }}
   labels:
     {{- include "emby.labels" . | nindent 4 }}
 spec:
-  type: LoadBalancer
+  {{- if and (eq .Values.service.type "LoadBalancer") (.Values.ingress.enabled) }}
+  type: ClusterIP
+  {{- else }}
+  type: {{ .Values.service.type }}
+  {{- end }}
   ports:
     - port: {{ .Values.service.port }}
       targetPort: http
       protocol: TCP
       name: http
   selector:
     {{- include "emby.selectorLabels" . | nindent 4 }}
-{{- end }}