diff --git a/pkg/chartutil/create.go b/pkg/chartutil/create.go index 43fb5f7d3..61dce9fa4 100644 --- a/pkg/chartutil/create.go +++ b/pkg/chartutil/create.go @@ -71,7 +71,7 @@ ingress: annotations: {} # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" - path: / + paths: [] hosts: - chart-example.local tls: [] @@ -123,7 +123,7 @@ const defaultIgnore = `# Patterns to ignore when building packages. const defaultIngress = `{{- if .Values.ingress.enabled -}} {{- $fullName := include ".fullname" . -}} -{{- $ingressPath := .Values.ingress.path -}} +{{- $ingressPaths := .Values.ingress.paths -}} apiVersion: extensions/v1beta1 kind: Ingress metadata: @@ -153,10 +153,12 @@ spec: - host: {{ . | quote }} http: paths: - - path: {{ $ingressPath }} + {{- range $ingressPaths }} + - path: {{ . }} backend: serviceName: {{ $fullName }} servicePort: http + {{- end }} {{- end }} {{- end }} ` @@ -237,8 +239,10 @@ spec: const defaultNotes = `1. Get the application URL by running these commands: {{- if .Values.ingress.enabled }} -{{- range .Values.ingress.hosts }} - http{{ if $.Values.ingress.tls }}s{{ end }}://{{ . }}{{ $.Values.ingress.path }} +{{- range $host := .Values.ingress.hosts }} + {{- range $.Values.ingress.paths }} + http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host }}{{ . }} + {{- end }} {{- end }} {{- else if contains "NodePort" .Values.service.type }} export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include ".fullname" . }})