Update helm chart

agile6v · Apr 3, 2019 · 50c005a · 50c005a
1 parent 17a0249
commit 50c005a
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/tools/helm/templates/ingress.yaml b/tools/helm/templates/ingress.yaml
@@ -3,7 +3,7 @@
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:
-  name: {{ $fullName }}
+  name: squeeze-ingress
   labels:
     app.kubernetes.io/name: {{ include "squeeze.name" . }}
     helm.sh/chart: {{ include "squeeze.chart" . }}
@@ -12,26 +12,18 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
-{{- if .Values.ingress.tls }}
-  tls:
-  {{- range .Values.ingress.tls }}
-    - hosts:
-      {{- range .hosts }}
-        - {{ . | quote }}
-      {{- end }}
-      secretName: {{ .secretName }}
-  {{- end }}
-{{- end }}
   rules:
   {{- range .Values.ingress.hosts }}
     - host: {{ .host | quote }}
       http:
         paths:
-        {{- range .paths }}
-          - path: {{ . }}
+          - path: /
             backend:
               serviceName: squeeze-master
               servicePort: 9998
-        {{- end }}
+          - path: /api/*
+            backend:
+              serviceName: squeeze-web
+              servicePort: 9991
   {{- end }}
 {{- end }}
diff --git a/tools/helm/templates/service.yaml b/tools/helm/templates/service.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 kind: Service
 metadata:
-  name: {{ include "squeeze.fullname" . }}
+  name: squeeze-master
   labels:
     app.kubernetes.io/name: {{ include "squeeze.name" . }}
     helm.sh/chart: {{ include "squeeze.chart" . }}
@@ -17,3 +17,20 @@ spec:
     app: squeeze
     role: master
     tier: backend
+---
+apiVersion: v1
+kind: Service
+metadata:
+  name: squeeze-web
+  labels:
+    app.kubernetes.io/name: {{ include "squeeze.name" . }}
+    helm.sh/chart: {{ include "squeeze.chart" . }}
+spec:
+  ports:
+  - port: 9991
+    name: "http"
+    targetPort: 9991
+  selector:
+    app: squeeze
+    role: web
+    tier: backend
diff --git a/tools/helm/values.yaml b/tools/helm/values.yaml
@@ -23,7 +23,8 @@ ingress:
     # kubernetes.io/tls-acme: "true"
   hosts:
     - host: squeeze-master.default
-      paths: ["/"]
+      paths:
+        - path
 
   tls: []
   #  - secretName: chart-example-tls