From beef062528cbbca62c4f4e30ac5e9c4fa5f76ee7 Mon Sep 17 00:00:00 2001
From: Alex Sukhov <acyxou@gmail.com>
Date: Wed, 4 May 2022 23:40:59 +0300
Subject: [PATCH] Fix service

---
 charts/hajimari/templates/ingress.yaml |  2 +-
 charts/hajimari/templates/service.yaml | 17 ++---------------
 charts/hajimari/values.yaml            |  4 +---
 3 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/charts/hajimari/templates/ingress.yaml b/charts/hajimari/templates/ingress.yaml
index 83899bb..fc72d34 100644
--- a/charts/hajimari/templates/ingress.yaml
+++ b/charts/hajimari/templates/ingress.yaml
@@ -32,7 +32,7 @@ spec:
             backend:
               service:
                 name: {{ $serviceName }}
-                port: 
+                port:
                   name: http
   {{- end }}
 {{- end }}
diff --git a/charts/hajimari/templates/service.yaml b/charts/hajimari/templates/service.yaml
index 13a7077..ca68462 100644
--- a/charts/hajimari/templates/service.yaml
+++ b/charts/hajimari/templates/service.yaml
@@ -1,27 +1,14 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "hajimari.fullname" . }}-service
+  name: {{ include "hajimari.fullname" . }}
   labels:
     {{- include "hajimari.labels" . | nindent 4 }}
-  annotations:
-  {{- range $key, $value := .Values.service.annotations }}
-    {{ $key }}: {{ $value | quote }}
-  {{- end }}
 spec:
   type: {{ .Values.service.type }}
-{{- if .Values.service.clusterIP }}
-  clusterIP: {{ .Values.service.clusterIP }}
-{{- end }}
-{{- if .Values.service.loadBalancerIP }}
-  loadBalancerIP: {{ .Values.service.loadBalancerIP }}
-{{- end }}
-{{- if .Values.service.externalTrafficPolicy }}
-  externalTrafficPolicy: {{ .Values.service.externalTrafficPolicy }}
-{{- end }}
   ports:
     - port: {{ .Values.service.port }}
-      targetPort: 3000
+      targetPort: http
       protocol: TCP
       name: http
   selector:
diff --git a/charts/hajimari/values.yaml b/charts/hajimari/values.yaml
index 23546b0..1b91aed 100644
--- a/charts/hajimari/values.yaml
+++ b/charts/hajimari/values.yaml
@@ -57,9 +57,7 @@ hajimari:
 # @default -- See values.yaml
 service:
   type: ClusterIP
-  ports:
-    http:
-      port: 3000
+  port: 3000
 
 # -- Configures service account needed for reading k8s ingress objects
 # @default -- See below