Merge pull request #63 from ConnorGraham/master

Support for multiple ingress paths

helm/k8dash/Chart.yaml

@@ -1,5 +1,5 @@
 apiVersion: v1
-version: 0.0.1
+version: 0.0.3
 appVersion: 0.0.1
 name: k8dash
 description: A Helm chart for Kubernetes K8Dash

helm/k8dash/index.yaml

@@ -3,9 +3,37 @@ entries:
   k8dash:
   - apiVersion: v1
     appVersion: 0.0.1
-    created: 2019-04-25T11:53:15.386073-05:00
+    created: "2020-01-30T16:04:39.096068-05:00"
     description: A Helm chart for Kubernetes K8Dash
-    digest: 7a84cff8455803b1a5610987e054cebbe52b14878a2db6b22ae7b455a6105e09
+    digest: 8b8a95c95f36967f3a8d7f93e5987887d8bf08e4f0565d4f3495a0015f25042f
+    maintainers:
+    - email: kiryanov.i@gmail.com
+      name: Ivan Kirianov
+    - email: eric@herbrandson.com
+      name: Eric Herbrandson
+    name: k8dash
+    urls:
+    - k8dash-0.0.3.tgz
+    version: 0.0.3
+  - apiVersion: v1
+    appVersion: 0.0.1
+    created: "2020-01-30T16:04:39.096068-05:00"
+    description: A Helm chart for Kubernetes K8Dash
+    digest: 032d1170af9317e6270b6a139f3a3a0fc3f7e25d3966e2ec30fed5077389e94e
+    maintainers:
+    - email: kiryanov.i@gmail.com
+      name: Ivan Kirianov
+    - email: eric@herbrandson.com
+      name: Eric Herbrandson
+    name: k8dash
+    urls:
+    - k8dash-0.0.2.tgz
+    version: 0.0.2
+  - apiVersion: v1
+    appVersion: 0.0.1
+    created: "2020-01-30T16:04:39.0950656-05:00"
+    description: A Helm chart for Kubernetes K8Dash
+    digest: 8011dae258eb9c869d3cdeb9b29f7cb1b27dbb08b84b518aef2e8777da8b4778
     maintainers:
     - email: kiryanov.i@gmail.com
       name: Ivan Kirianov
@@ -15,4 +43,4 @@ entries:
     urls:
     - k8dash-0.0.1.tgz
     version: 0.0.1
-generated: 2019-04-25T11:53:15.385127-05:00
+generated: "2020-01-30T16:04:39.0950656-05:00"

helm/k8dash/kubernetes-k8dash-serviceaccount.yaml

@@ -0,0 +1,19 @@
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8dash-sa
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: k8dash-sa
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: k8dash-sa
+  namespace: default
+---

helm/k8dash/templates/ingress.yaml

@@ -17,10 +17,12 @@ spec:
     - host: {{ .Values.ingress.host }}
       http:
         paths:
-          - path: /
+{{- range $p := .Values.ingress.paths }}
+          - path: {{ $p }}
             backend:
               serviceName: k8dash
               servicePort: 80
+{{- end -}}
   {{- if .Values.ingress.tls }}
   tls:
 {{ toYaml .Values.ingress.tls | indent 4 }}

helm/k8dash/templates/serviceaccount.yaml

@@ -0,0 +1,21 @@
+{{- if .Values.createServiceAccount -}}
+---
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8dash-sa
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: k8dash-sa
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: k8dash-sa
+  namespace: {{ .Release.Namespace }}
+---
+{{- end -}}

helm/k8dash/values.yaml

@@ -20,6 +20,9 @@ service:
   type: NodePort
   servicePort: 4654
 
+# If true will create k8dash-sa and associate with cluster-admin role. Secret can be used for auth page with:
+# kubectl describe secret k8dash-sa-token-xxxxx
+createServiceAccount: false
 
 ingress:
   enabled: false
@@ -30,6 +33,8 @@ ingress:
 
   ## Kubernetes Dashboard Ingress hostnames
   # host: kubernetes-dashboard.domain.com
+  paths:
+    - /
 
   ## Kubernetes Dashboard Ingress TLS configuration
   # tls:

kubernetes-k8dash-serviceaccount.yaml

@@ -0,0 +1,18 @@
+apiVersion: v1
+kind: ServiceAccount
+metadata:
+  name: k8dash-sa
+---
+apiVersion: rbac.authorization.k8s.io/v1beta1
+kind: ClusterRoleBinding
+metadata:
+  name: k8dash-sa
+roleRef:
+  apiGroup: rbac.authorization.k8s.io
+  kind: ClusterRole
+  name: cluster-admin
+subjects:
+- kind: ServiceAccount
+  name: k8dash-sa
+  namespace: default
+---