fixed ingressPath for other apigws

Author: eiximenis

k8s/helm/apigwmm/templates/_names.tpl

@@ -40,10 +40,12 @@
 
 
 {{ define "pathBase" -}}
-{{- if .Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" . -}}
-{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if $ctx.Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" $ctx -}}
+{{- printf "/%s-%s"  $name $suffix -}}
 {{- else -}}
-{{- .Values.pathBase -}}
+{{- printf "/%s" $name -}}
 {{- end -}}
 {{- end -}}

k8s/helm/apigwmm/templates/deployment.yaml

@@ -45,7 +45,7 @@ spec:
           mountPath: /app/configuration          
           env:
             - name: PATH_BASE
-              value: {{ include "pathBase" . }}
+              value: {{ include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw  .) }}
             - name: k8sname
               value: {{ .Values.clusterName }}
           {{- if .Values.env.values -}}

k8s/helm/apigwmm/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apigwmm.fullname" . -}}
-{{- $ingressPath := include "pathBase" . -}}
+{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobilemarketingapigw  .) -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

k8s/helm/apigwms/templates/_names.tpl

@@ -40,10 +40,12 @@
 
 
 {{ define "pathBase" -}}
-{{- if .Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" . -}}
-{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if $ctx.Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" $ctx -}}
+{{- printf "/%s-%s"  $name $suffix -}}
 {{- else -}}
-{{- .Values.pathBase -}}
+{{- printf "/%s" $name -}}
 {{- end -}}
 {{- end -}}

k8s/helm/apigwms/templates/deployment.yaml

@@ -45,7 +45,7 @@ spec:
           mountPath: /app/configuration          
           env:
             - name: PATH_BASE
-              value: {{ include "pathBase" . }}
+              value: {{ include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw  .) }}
             - name: k8sname
               value: {{ .Values.clusterName }}
           {{- if .Values.env.values -}}

k8s/helm/apigwms/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apigwms.fullname" . -}}
-{{- $ingressPath := include "pathBase" . -}}
+{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.mobileshoppingapigw  .) -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata:

k8s/helm/apigwwm/templates/_names.tpl

@@ -40,10 +40,12 @@
 
 
 {{ define "pathBase" -}}
-{{- if .Values.inf.k8s.suffix -}}
-{{- $suffix := include "suffix-name" . -}}
-{{- printf "%s-%s"  .Values.pathBase $suffix -}}
+{{- $name := first .}}
+{{- $ctx := last .}}
+{{- if $ctx.Values.inf.k8s.suffix -}}
+{{- $suffix := include "suffix-name" $ctx -}}
+{{- printf "/%s-%s"  $name $suffix -}}
 {{- else -}}
-{{- .Values.pathBase -}}
+{{- printf "/%s" $name -}}
 {{- end -}}
 {{- end -}}

k8s/helm/apigwwm/templates/deployment.yaml

@@ -45,7 +45,7 @@ spec:
           mountPath: /app/configuration          
           env:
             - name: PATH_BASE
-              value: {{ include "pathBase" . }}
+              value: {{ include "pathBase" (list .Values.app.ingress.entries.webmarketingapigw  .) }}
             - name: k8sname
               value: {{ .Values.clusterName }}
           {{- if .Values.env.values -}}

k8s/helm/apigwwm/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "apigwwm.fullname" . -}}
-{{- $ingressPath := include "pathBase" . -}}
+{{- $ingressPath := include "pathBase" (list .Values.app.ingress.entries.webmarketingapigw  .) -}}
 apiVersion: extensions/v1beta1
 kind: Ingress
 metadata: