From 765c5633dfab3836383c07251a1d7de100c08ae6 Mon Sep 17 00:00:00 2001 From: Jens Langhammer Date: Thu, 4 Jul 2019 16:07:16 +0200 Subject: [PATCH] helm: add appgw to ingress --- ...assbook-web-ingress.yaml => passbook-ingress.yaml} | 11 ++++++++++- helm/passbook/templates/passbook-web-service.yaml | 2 +- helm/passbook/values.yaml | 2 ++ 3 files changed, 13 insertions(+), 2 deletions(-) rename helm/passbook/templates/{passbook-web-ingress.yaml => passbook-ingress.yaml} (76%) diff --git a/helm/passbook/templates/passbook-web-ingress.yaml b/helm/passbook/templates/passbook-ingress.yaml similarity index 76% rename from helm/passbook/templates/passbook-web-ingress.yaml rename to helm/passbook/templates/passbook-ingress.yaml index 0ff329cce..5557fc4d6 100644 --- a/helm/passbook/templates/passbook-web-ingress.yaml +++ b/helm/passbook/templates/passbook-ingress.yaml @@ -32,7 +32,16 @@ spec: paths: - path: {{ $ingressPath }} backend: - serviceName: {{ $fullName }} + serviceName: {{ $fullName }}-web + servicePort: http + {{- end }} + {{- range .Values.ingress.app_gw_hosts }}} + - host: {{ . | quote }} + http: + paths: + - path: {{ $ingressPath }} + backend: + serviceName: {{ $fullName }}-appgw servicePort: http {{- end }} {{- end }} diff --git a/helm/passbook/templates/passbook-web-service.yaml b/helm/passbook/templates/passbook-web-service.yaml index 9406e6c67..d6564161f 100644 --- a/helm/passbook/templates/passbook-web-service.yaml +++ b/helm/passbook/templates/passbook-web-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: {{ include "passbook.fullname" . }} + name: {{ include "passbook.fullname" . }}-web labels: app.kubernetes.io/name: {{ include "passbook.name" . }} helm.sh/chart: {{ include "passbook.chart" . }} diff --git a/helm/passbook/values.yaml b/helm/passbook/values.yaml index 7a30d70a0..8ac9d6086 100644 --- a/helm/passbook/values.yaml +++ b/helm/passbook/values.yaml @@ -37,6 +37,8 @@ ingress: path: / hosts: - passbook.k8s.local + app_gw_hosts: + - '*.passbook.k8s.local' defaultHost: passbook.k8s.local tls: [] # - secretName: chart-example-tls