service

charts/gke-ingress/templates/_helpers.tpl

@@ -46,13 +46,13 @@ app.kubernetes.io/name: {{ include "gke-ingress.name" . }}
 {{- if hasKey .Values.service.labels "app" }}
 {{- with .Values.service.labels.app }}app: {{.|quote}}
 {{- end}}
-{{- else }}app: {{ include "gateway.name" . }}
+{{- else }}app: {{ include "gke-ingress.name" . }}
 {{- end }}
 {{- if hasKey .Values.service.labels "istio" }}
 {{- with .Values.service.labels.istio }}
 istio: {{.|quote}}
 {{- end}}
 {{- else }}
-istio: {{ include "gateway.name" . | trimPrefix "istio-" }}
+istio: {{ include "gke-ingress.name" . | trimPrefix "istio-" }}
 {{- end }}
 {{- end }}

charts/gke-ingress/templates/service.yaml

@@ -1,15 +1,18 @@
+{{range .Values.service}}
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ .Values.service.name }}
-  namespace: {{ .Release.Namespace }}
+  name: {{ .name }}
+  namespace: {{ default "istio-ingress" .namespace}}
   labels:
     {{- include "gke-ingress.labels" . | nindent 4 }}
   annotations:
-    {{- .Values.service.annotations | toYaml | nindent 4 }}
+    {{- .annotations | toYaml | nindent 4 }}
 spec:
-  type: {{ .Values.service.type }}
+  type: {{ .type }}
   ports:
-{{ .Values.service.ports | toYaml | indent 4 }}
+{{ .ports | toYaml | indent 4 }}
   selector:
-    {{- include "gke-ingress.selectorLabels" . | nindent 4 }}
+    {{- include "gke-ingress.selectorLabels" . | nindent 4 }}
+---
+{{ end }}