diff --git a/stable/kubernetes-dashboard/Chart.yaml b/stable/kubernetes-dashboard/Chart.yaml index 2893d6241302..f844e1f69944 100644 --- a/stable/kubernetes-dashboard/Chart.yaml +++ b/stable/kubernetes-dashboard/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kubernetes-dashboard -version: 1.5.2 +version: 1.5.3 appVersion: 1.10.1 description: General-purpose web UI for Kubernetes clusters keywords: diff --git a/stable/kubernetes-dashboard/README.md b/stable/kubernetes-dashboard/README.md index 8bb217feca75..d411ba557335 100644 --- a/stable/kubernetes-dashboard/README.md +++ b/stable/kubernetes-dashboard/README.md @@ -47,22 +47,23 @@ The following table lists the configurable parameters of the kubernetes-dashboar | `image.repository` | Repository for container image | `k8s.gcr.io/kubernetes-dashboard-amd64` | | `image.tag` | Image tag | `v1.10.1` | | `image.pullPolicy` | Image pull policy | `IfNotPresent` | -| `image.pullSecrets` | Image pull secrets | `[]` | +| `image.pullSecrets` | Image pull secrets | `[]` | | `annotations` | Annotations for deployment | `{}` | | `replicaCount` | Number of replicas | `1` | | `extraArgs` | Additional container arguments | `[]` | | `podAnnotations` | Annotations to be added to pods | {} | | `nodeSelector` | node labels for pod assignment | `{}` | | `tolerations` | List of node taints to tolerate (requires Kubernetes >= 1.6) | `[]` | -| `affinity` | Affinity for pod assignment | `[]` | -| `enableSkipLogin` | Enable possibility to skip login | `false` | -| `enableInsecureLogin` | Serve application over HTTP without TLS | `false` | +| `affinity` | Affinity for pod assignment | `[]` | +| `enableSkipLogin` | Enable possibility to skip login | `false` | +| `enableInsecureLogin` | Serve application over HTTP without TLS | `false` | | `service.externalPort` | Dashboard external port | 443 | | `service.internalPort` | Dashboard internal port | 443 | | `service.loadBalancerSourceRanges` | list of IP CIDRs allowed access to load balancer (if supported) | nil | +| `ingress.labels` | Add custom labels | `[]` | | `ingress.annotations` | Specify ingress class | `kubernetes.io/ingress.class: nginx` | | `ingress.enabled` | Enable ingress controller resource | `false` | -| `ingress.paths` | Paths to match against incoming requests. Both `/` and `/*` are required to work on gce ingress. | `[/]` | +| `ingress.paths` | Paths to match against incoming requests. Both `/` and `/*` are required to work on gce ingress. | `[/]` | | `ingress.hosts` | Dashboard Hostnames | `nil` | | `ingress.tls` | Ingress TLS configuration | `[]` | | `resources` | Pod resource requests & limits | `limits: {cpu: 100m, memory: 100Mi}, requests: {cpu: 100m, memory: 100Mi}` | diff --git a/stable/kubernetes-dashboard/templates/ingress.yaml b/stable/kubernetes-dashboard/templates/ingress.yaml index 171d48c58303..d46aa9f99bcb 100644 --- a/stable/kubernetes-dashboard/templates/ingress.yaml +++ b/stable/kubernetes-dashboard/templates/ingress.yaml @@ -11,6 +11,9 @@ metadata: chart: {{ template "kubernetes-dashboard.chart" . }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} + {{- range $key, $value := .Values.ingress.labels }} + {{ $key }}: {{ $value | quote }} + {{- end }} {{- if .Values.ingress.annotations }} annotations: {{ toYaml .Values.ingress.annotations | indent 4 }} diff --git a/stable/kubernetes-dashboard/values.yaml b/stable/kubernetes-dashboard/values.yaml index 56a6c2297c6a..6823b477848b 100644 --- a/stable/kubernetes-dashboard/values.yaml +++ b/stable/kubernetes-dashboard/values.yaml @@ -93,6 +93,9 @@ ingress: ## Kubernetes Dashboard Ingress annotations ## + ## Add custom labels + # labels: + # key: value # annotations: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: 'true'