Zeppelin: add Ingress and nodeSelector (helm#9851)

* Zeppelin: add Ingress and nodeSelector Signed-off-by: mcapuccini <[email protected]> * Values linting Signed-off-by: mcapuccini <[email protected]> * Bump up chart Signed-off-by: Marco Capuccini <[email protected]> * Ingress values refactory Signed-off-by: mcapuccini <[email protected]>
agolo · Dec 12, 2018 · 8ad6380 · 8ad6380
1 parent b7314f6
commit 8ad6380
Show file tree

Hide file tree

Showing 5 changed files with 65 additions and 2 deletions.
diff --git a/stable/zeppelin/Chart.yaml b/stable/zeppelin/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: Web-based notebook that enables data-driven, interactive data analytics and collaborative documents with SQL, Scala and more.
 name: zeppelin
-version: 1.0.1
+version: 1.1.0
 appVersion: 0.7.2
 home: https://zeppelin.apache.org/
 sources:

diff --git a/stable/zeppelin/README.md b/stable/zeppelin/README.md
@@ -26,6 +26,12 @@ The following table lists the configurable parameters of the Zeppelin chart and
 | `hadoop.useConfigMap`                | Use external Hadoop configuration for Spark executors             | `false`                                                    |
 | `hadoop.configMapName`               | Name of the hadoop config map to use (must be in same namespace)  | `hadoop-config`                                            |
 | `hadoop.configPath`                  | Path in the Zeppelin image where the Hadoop config is mounted     | `/usr/hadoop-2.7.3/etc/hadoop`                             |
+| `ingress.enabled`                    | Enable ingress                                                    | `false`                                                    |
+| `ingress.annotations`                | Ingress annotations                                               | `{}`                                                       |
+| `ingress.hosts`                      | Ingress Hostnames                                                 | `["zeppelin.local"]`                                       |
+| `ingress.path`                       | Path within the URL structure                                     | `/`                                                        |
+| `ingress.tls`                        | Ingress TLS configuration                                         | `[]`                                                       |
+| `nodeSelecor`                        | Node selector for the Zeppelin deployment                         | `{}`                                                       |
 
 ## Related charts
 

diff --git a/stable/zeppelin/templates/deployment.yaml b/stable/zeppelin/templates/deployment.yaml
@@ -58,4 +58,8 @@ spec:
         - name: hadoop-config
           configMap:
             name: {{ .Values.hadoop.configMapName }}
-{{- end }}
+{{- end }}
+{{- if .Values.nodeSelector }}
+      nodeSelector:
+{{ toYaml .Values.nodeSelector | indent 8 }}
+{{- end }}
diff --git a/stable/zeppelin/templates/ingress.yaml b/stable/zeppelin/templates/ingress.yaml
@@ -0,0 +1,38 @@
+{{- if .Values.ingress.enabled }}
+{{- $ingressPath := .Values.ingress.path -}}
+{{- $fullName := printf "%s-zeppelin" .Release.Name -}}
+apiVersion: extensions/v1beta1
+kind: Ingress
+metadata:
+  name: {{ $fullName }}
+  labels:
+    app: {{ template "zeppelin.name" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+{{- with .Values.ingress.annotations }}
+  annotations:
+{{ toYaml . | indent 4 }}
+{{- end }}
+spec:
+  rules:
+  {{- range .Values.ingress.hosts }}
+  - host: {{ . | quote }}
+    http:
+      paths:
+        - path: {{ $ingressPath }}
+          backend:
+            serviceName: {{ $fullName }}
+            servicePort: 8080
+  {{- end }}
+{{- if .Values.ingress.tls }}
+  tls:
+  {{- range .Values.ingress.tls }}
+    - hosts:
+      {{- range .hosts }}
+        - {{ . | quote }}
+      {{- end }}
+      secretName: {{ .secretName }}
+  {{- end }}
+{{- end }}
+{{- end }}
diff --git a/stable/zeppelin/values.yaml b/stable/zeppelin/values.yaml
@@ -14,3 +14,18 @@ spark:
   driverMemory: 1g
   executorMemory: 1g
   numExecutors: 2
+
+ingress:
+  enabled: false
+  annotations: {}
+    # kubernetes.io/ingress.class: nginx
+    # kubernetes.io/tls-acme: "true"
+    # nginx.ingress.kubernetes.io/auth-secret: zeppelin-tls-secret
+  path: /
+  hosts:
+    - zeppelin.local
+  tls: []
+    # - secretName: zeppelin-tls-secret
+    #   hosts: zeppelin.local
+
+nodeSelector: {}