Merge pull request #37 from dysnix/update-app

[dysnix/app] fix ingress
dysnix · May 25, 2021 · c9f4645 · c9f4645
2 parents a6ba402 + cd7bd37
commit c9f4645
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/dysnix/app/Chart.yaml b/dysnix/app/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v2
 name: app
 description: Generic application Helm chart
-version: 0.3.6
+version: 0.3.7
 engine: gotpl
 sources:
   - https://github.com/dysnix/charts

diff --git a/dysnix/app/templates/ingress.yaml b/dysnix/app/templates/ingress.yaml
@@ -28,8 +28,8 @@ spec:
             {{- if eq "true" (include "common.ingress.supportsPathType" .) }}
             pathType: {{ .Values.ingress.pathType }}
             {{- end }}
-            {{- $svcName := include "app.service.defaultPortName" (pick .Values.service "port" "targetPort") }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" $svcName "servicePort" (.Values.service.port) "context" .) | nindent 14 }}
+            {{- $svcPort := include "app.service.defaultPortName" (pick .Values.service "port" "targetPort") }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "common.names.fullname" .) "servicePort" $svcPort "context" .) | nindent 14 }}
     {{- end }}
     {{- range .Values.ingress.extraHosts }}
     - host: {{ .name }}