fix: service backend in ingress

Author: rossmcewan

charts/nango/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: nango
 type: application
-version: 2.0.2
+version: 2.0.3
 dependencies:
   - condition: postgresql.enabled
     name: postgresql

charts/nango/templates/jobs/ingress.yaml

@@ -24,15 +24,15 @@ spec:
           {{- end }}
           - path: {{ .Values.jobs.ingress.path }}
             pathType: {{ .Values.jobs.ingress.pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jobs.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jobs.names.service" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.jobs.ingress.extraHosts }}
     - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jobs.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "jobs.names.service" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.jobs.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.jobs.ingress.extraRules "context" $) | nindent 4 }}

charts/nango/templates/orchestrator/ingress.yaml

@@ -24,15 +24,15 @@ spec:
           {{- end }}
           - path: {{ .Values.orchestrator.ingress.path }}
             pathType: {{ .Values.orchestrator.ingress.pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "orchestrator.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "orchestrator.names.service" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.orchestrator.ingress.extraHosts }}
     - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "orchestrator.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "orchestrator.names.service" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.orchestrator.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.orchestrator.ingress.extraRules "context" $) | nindent 4 }}

charts/nango/templates/persist/ingress.yaml

@@ -24,15 +24,15 @@ spec:
           {{- end }}
           - path: {{ .Values.persist.ingress.path }}
             pathType: {{ .Values.persist.ingress.pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "persist.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "persist.names.service" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.persist.ingress.extraHosts }}
     - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "persist.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "persist.names.service" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.persist.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.persist.ingress.extraRules "context" $) | nindent 4 }}

charts/nango/templates/runner/ingress.yaml

@@ -25,15 +25,15 @@ spec:
           {{- end }}
           - path: {{ .Values.runner.ingress.path }}
             pathType: {{ .Values.runner.ingress.pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "runner.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "runner.names.service" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.runner.ingress.extraHosts }}
     - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "runner.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "runner.names.service" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.runner.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.runner.ingress.extraRules "context" $) | nindent 4 }}

charts/nango/templates/server/ingress.yaml

@@ -24,15 +24,15 @@ spec:
           {{- end }}
           - path: {{ .Values.server.ingress.path }}
             pathType: {{ .Values.server.ingress.pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "server.names.fullname" .) "servicePort" "http" "context" $)  | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "server.names.service" .) "servicePort" "http" "context" $)  | nindent 14 }}
     {{- end }}
     {{- range .Values.server.ingress.extraHosts }}
     - host: {{ .name | quote }}
       http:
         paths:
           - path: {{ default "/" .path }}
             pathType: {{ default "ImplementationSpecific" .pathType }}
-            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "server.names.fullname" $) "servicePort" "http" "context" $) | nindent 14 }}
+            backend: {{- include "common.ingress.backend" (dict "serviceName" (include "server.names.service" $) "servicePort" "http" "context" $) | nindent 14 }}
     {{- end }}
     {{- if .Values.server.ingress.extraRules }}
     {{- include "common.tplvalues.render" (dict "value" .Values.server.ingress.extraRules "context" $) | nindent 4 }}