Merge "Ingress: Give arbitary fqdns a different name from namespaced rules"

This commit is contained in:
Zuul 2018-03-30 05:20:19 +00:00 committed by Gerrit Code Review
commit 02d2367fcf

View File

@ -62,7 +62,7 @@ spec:
apiVersion: extensions/v1beta1 apiVersion: extensions/v1beta1
kind: Ingress kind: Ingress
metadata: metadata:
name: {{ $ingressName }} name: {{ printf "%s-%s" $ingressName "fqdn" }}
annotations: annotations:
kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" "cluster" | quote }} kubernetes.io/ingress.class: {{ index $envAll.Values.network $backendService "ingress" "classes" "cluster" | quote }}
{{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }} {{ toYaml (index $envAll.Values.network $backendService "ingress" "annotations") | indent 4 }}