From 3fbda602280d72223814c75c540146a70ca2772c Mon Sep 17 00:00:00 2001 From: ConnorGraham Date: Thu, 30 Jan 2020 12:57:07 -0500 Subject: [PATCH 1/3] Support for multiple ingress paths --- helm/k8dash/Chart.yaml | 2 +- helm/k8dash/index.yaml | 18 ++++++++++++++++-- helm/k8dash/k8dash-0.0.2.tgz | Bin 0 -> 5430 bytes helm/k8dash/templates/ingress.yaml | 4 +++- helm/k8dash/values.yaml | 2 ++ 5 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 helm/k8dash/k8dash-0.0.2.tgz diff --git a/helm/k8dash/Chart.yaml b/helm/k8dash/Chart.yaml index 31b56ec..755501b 100644 --- a/helm/k8dash/Chart.yaml +++ b/helm/k8dash/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 0.0.1 +version: 0.0.2 appVersion: 0.0.1 name: k8dash description: A Helm chart for Kubernetes K8Dash diff --git a/helm/k8dash/index.yaml b/helm/k8dash/index.yaml index 5d5495b..67c3c36 100644 --- a/helm/k8dash/index.yaml +++ b/helm/k8dash/index.yaml @@ -3,7 +3,21 @@ entries: k8dash: - apiVersion: v1 appVersion: 0.0.1 - created: 2019-04-25T11:53:15.386073-05:00 + created: "2020-01-30T12:57:53.1625874-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-30T12:57:53.1615864-05:00" description: A Helm chart for Kubernetes K8Dash digest: 7a84cff8455803b1a5610987e054cebbe52b14878a2db6b22ae7b455a6105e09 maintainers: @@ -15,4 +29,4 @@ entries: urls: - k8dash-0.0.1.tgz version: 0.0.1 -generated: 2019-04-25T11:53:15.385127-05:00 +generated: "2020-01-30T12:57:53.1606022-05:00" diff --git a/helm/k8dash/k8dash-0.0.2.tgz b/helm/k8dash/k8dash-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..752e3f1cdea6437abcfa2fc65164802ed15bd026 GIT binary patch literal 5430 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 literal 0 HcmV?d00001 diff --git a/helm/k8dash/templates/ingress.yaml b/helm/k8dash/templates/ingress.yaml index ed06feb..922e86b 100644 --- a/helm/k8dash/templates/ingress.yaml +++ b/helm/k8dash/templates/ingress.yaml @@ -17,10 +17,12 @@ spec: - host: {{ .Values.ingress.host }} http: paths: - - path: / +{{- range $p := $paths }} + - path: {{ $p }} backend: serviceName: k8dash servicePort: 80 +{{- end -}} {{- if .Values.ingress.tls }} tls: {{ toYaml .Values.ingress.tls | indent 4 }} diff --git a/helm/k8dash/values.yaml b/helm/k8dash/values.yaml index 5edfb4d..789789c 100644 --- a/helm/k8dash/values.yaml +++ b/helm/k8dash/values.yaml @@ -30,6 +30,8 @@ ingress: ## Kubernetes Dashboard Ingress hostnames # host: kubernetes-dashboard.domain.com + paths: + - / ## Kubernetes Dashboard Ingress TLS configuration # tls: From d1dbe46145cfcfb464454d69b61a9c0b035f19ca Mon Sep 17 00:00:00 2001 From: ConnorGraham Date: Thu, 30 Jan 2020 15:42:09 -0500 Subject: [PATCH 2/3] Typo --- helm/k8dash/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/helm/k8dash/templates/ingress.yaml b/helm/k8dash/templates/ingress.yaml index 922e86b..e9bcae4 100644 --- a/helm/k8dash/templates/ingress.yaml +++ b/helm/k8dash/templates/ingress.yaml @@ -17,7 +17,7 @@ spec: - host: {{ .Values.ingress.host }} http: paths: -{{- range $p := $paths }} +{{- range $p := .Values.ingress.paths }} - path: {{ $p }} backend: serviceName: k8dash From 5f3810edef98507265ab486211e3173808e92d97 Mon Sep 17 00:00:00 2001 From: ConnorGraham Date: Thu, 30 Jan 2020 16:03:35 -0500 Subject: [PATCH 3/3] Service account yaml --- helm/k8dash/Chart.yaml | 2 +- helm/k8dash/index.yaml | 22 ++++++++++++++---- helm/k8dash/k8dash-0.0.3.tgz | Bin 0 -> 1580 bytes .../kubernetes-k8dash-serviceaccount.yaml | 19 +++++++++++++++ helm/k8dash/templates/serviceaccount.yaml | 21 +++++++++++++++++ helm/k8dash/values.yaml | 3 +++ kubernetes-k8dash-serviceaccount.yaml | 18 ++++++++++++++ 7 files changed, 80 insertions(+), 5 deletions(-) create mode 100644 helm/k8dash/k8dash-0.0.3.tgz create mode 100644 helm/k8dash/kubernetes-k8dash-serviceaccount.yaml create mode 100644 helm/k8dash/templates/serviceaccount.yaml create mode 100644 kubernetes-k8dash-serviceaccount.yaml diff --git a/helm/k8dash/Chart.yaml b/helm/k8dash/Chart.yaml index 755501b..7d36a4f 100644 --- a/helm/k8dash/Chart.yaml +++ b/helm/k8dash/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v1 -version: 0.0.2 +version: 0.0.3 appVersion: 0.0.1 name: k8dash description: A Helm chart for Kubernetes K8Dash diff --git a/helm/k8dash/index.yaml b/helm/k8dash/index.yaml index 67c3c36..cdbb563 100644 --- a/helm/k8dash/index.yaml +++ b/helm/k8dash/index.yaml @@ -3,7 +3,21 @@ entries: k8dash: - apiVersion: v1 appVersion: 0.0.1 - created: "2020-01-30T12:57:53.1625874-05:00" + created: "2020-01-30T16:04:39.096068-05:00" + description: A Helm chart for Kubernetes K8Dash + 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: @@ -17,9 +31,9 @@ entries: version: 0.0.2 - apiVersion: v1 appVersion: 0.0.1 - created: "2020-01-30T12:57:53.1615864-05:00" + created: "2020-01-30T16:04:39.0950656-05:00" description: A Helm chart for Kubernetes K8Dash - digest: 7a84cff8455803b1a5610987e054cebbe52b14878a2db6b22ae7b455a6105e09 + digest: 8011dae258eb9c869d3cdeb9b29f7cb1b27dbb08b84b518aef2e8777da8b4778 maintainers: - email: kiryanov.i@gmail.com name: Ivan Kirianov @@ -29,4 +43,4 @@ entries: urls: - k8dash-0.0.1.tgz version: 0.0.1 -generated: "2020-01-30T12:57:53.1606022-05:00" +generated: "2020-01-30T16:04:39.0950656-05:00" diff --git a/helm/k8dash/k8dash-0.0.3.tgz b/helm/k8dash/k8dash-0.0.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..f0f0aee28e439fe829f60eda92625045ae1345e6 GIT binary patch literal 1580 zcmV+{2GjW;iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI>{Z`(K$@3Vk>2O{Xx0dlGTj(`K&YY*3=y&z~81s3QFC5>%v zC{jz(M%`?_`+^cB%d!%;Th~bd&r8f9IYZ89eluivJuQe@e0jYfQcu>TWX}#y7-JlV zVf`0lJp7A;FzSBSe9sS(;2FZdU@beeRGP?V_@{LZH}^z{RP-}QMFmgM%5z9nbxl0M z6VE9?<&svqX1zjhft4sXUkjQEiQX?WkQ_89^nUt=sD)D!$~B=Jq)HtZK}je}(KVH8 z!o_MrU(O9@l8e$oh?5dh^ln8sdQT-aBQ|qD(){HDWF`qOl;B%){wryY-flXbhTVM5 z&Z@tMzK6gPzW9%lU>N^#5T4@y7?evO8a{zs(Hvgoxma?Yq8VWd z99oh&q+Q6_*g~jUGIk{x&DSY67~idS$~3D@Io0CW*$f?iat+5#b{1mH}>!x2`g$KaPw2WSa}&};+;9ylou&_(|r_YP6?V6M3eNa`{vJYZqTGD zAumY@==S#9bTX0wQ}sB6NL95E(lF{GVr;Iv;n=0M0u695AgWdQv1x57MFx4OHpsO- z$YNYGPF0ZC3$t;qQe?({Zqi^s_|fg{Ssl*|axJ9YO-XdV_|V_q$PRnU9a*gz(}rCu zwQpKOY+J*qj{RB?>b6@OUUUUo%W|zFcYLu?(jgtQZZt^3=YXD9DE;@2lzQA2!W*TATPuBD4f+tuNPZ2x7+_;p>Rt{! zJu;-JhNpP5f45O`hv_wISE$+jrZyu7CT^s5N_vflj=9G~JNR#1bwvEfQLu~uVRXX( zW6<{fUyJ1y7oRSccbHlUY0EixXZ=lY14yQ&iJXJp9N9LP+|p zE|(_PQ#GMtSYf_qOQk`66b$}Dc|rMnpDrmFe1uuuNhvNUB#J$JF--tRVGdaak)L_tG?@~=$l}cR2_#tvT82=XkuRBM%ZLNB^bKu_lpKyr(NqnmRjzgzo-7h%S6)+=9 erfZ`-w1ZD{q7$9y4*EL)0RR81^-YWbE&u@b8~s-R literal 0 HcmV?d00001 diff --git a/helm/k8dash/kubernetes-k8dash-serviceaccount.yaml b/helm/k8dash/kubernetes-k8dash-serviceaccount.yaml new file mode 100644 index 0000000..d5deea9 --- /dev/null +++ b/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 +--- \ No newline at end of file diff --git a/helm/k8dash/templates/serviceaccount.yaml b/helm/k8dash/templates/serviceaccount.yaml new file mode 100644 index 0000000..212a643 --- /dev/null +++ b/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 -}} \ No newline at end of file diff --git a/helm/k8dash/values.yaml b/helm/k8dash/values.yaml index 789789c..434b87a 100644 --- a/helm/k8dash/values.yaml +++ b/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 diff --git a/kubernetes-k8dash-serviceaccount.yaml b/kubernetes-k8dash-serviceaccount.yaml new file mode 100644 index 0000000..810beb1 --- /dev/null +++ b/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 +---