Issue 5622: Kubeless optional Ingress for UI (#5623)

* Add optional Ingress to Kubeless UI and bump version

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>

* Update README.md with Ingress default values

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>

* Update template with include according to Helm documentation best practices

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>

* Revert conversion of 'template' to 'include'

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>

* Bump version up post-master merge

Signed-off-by: Alejandro Vicente Grabovetsky <sasha@aid.technology>

incubator/kubeless/Chart.yaml

@@ -1,5 +1,5 @@
 name: kubeless
-version: 1.0.2
+version: 1.0.3
 appVersion: v1.0.0-alpha.3
 description: Kubeless is a Kubernetes-native serverless framework. It runs on top of your Kubernetes cluster and allows you to deploy small unit of code without having to build container images.
 icon: https://cloud.githubusercontent.com/assets/4056725/25480209/1d5bf83c-2b48-11e7-8db8-bcd650f31297.png

incubator/kubeless/README.md

@@ -69,6 +69,11 @@ The following table lists the configurable parameters of the Kubeless chart and
 | `ui.service.name`                        | Service name                               | `ui-port`                             |
 | `ui.service.type`                        | Kubernetes service name                    | `NodePort`                            |
 | `ui.service.externalPort`                | Service external port                      | `3000`                                |
+| `ui.ingress.enabled`                     | Kubeless UI ingress switch                 | `false`                               |
+| `ui.ingress.annotations`                 | Kubeless UI ingress annotations            | `{}`                                  |
+| `ui.ingress.path`                        | Kubeless UI ingress path                   | `{}`                                  |
+| `ui.ingress.hosts`                       | Kubeless UI ingress hosts                  | `[chart-example.local]`               |
+| `ui.ingress.tls`                         | Kubeless UI ingress TLS                    | `[]`                                  |
 
 Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example,
 

incubator/kubeless/templates/ui-ingress.yaml

@@ -0,0 +1,36 @@
+{{- if and .Values.ui.enabled .Values.ui.ingress.enabled -}}
+{{- $fullName := include "kubeless.fullname" . -}}
+{{- $ingressPath := .Values.ui.ingress.path -}}
+{{- $portName := .Values.ui.service.name -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}-ui
+  labels:
+{{ include "labels.standard" . | indent 4 }}
+{{- with .Values.ui.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+{{- if .Values.ui.ingress.tls }}
+  tls:
+  {{- range .Values.ui.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+  rules:
+  {{- range .Values.ui.ingress.hosts }}
+    - host: {{ . }}
+      http:
+        paths:
+          - path: {{ $ingressPath }}
+            backend:
+              serviceName: {{ $fullName }}-ui
+              servicePort: {{ $portName }}
+  {{- end }}
+{{- end }}

incubator/kubeless/values.yaml

@@ -172,3 +172,16 @@ ui:
     name: ui-port
     type: NodePort
     externalPort: 3000
+
+  ingress:
+    enabled: false
+    annotations: {}
+      # kubernetes.io/ingress.class: nginx
+      # kubernetes.io/tls-acme: "true"
+    path: /
+    hosts:
+      - chart-example.local
+    tls: []
+    #  - secretName: chart-example-tls
+    #    hosts:
+    #      - chart-example.local