From 8e5e61575c28373394addb140c732857255b351e Mon Sep 17 00:00:00 2001 From: pasqualet Date: Wed, 19 Dec 2018 17:38:40 +0100 Subject: [PATCH] [stable/docker-registry] Add labels to ingress object (#9831) Signed-off-by: Pasquale Toscano --- stable/docker-registry/Chart.yaml | 2 +- stable/docker-registry/README.md | 3 ++- stable/docker-registry/templates/ingress.yaml | 3 +++ stable/docker-registry/values.yaml | 1 + 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/stable/docker-registry/Chart.yaml b/stable/docker-registry/Chart.yaml index 1fb641aa01..86016f5f53 100644 --- a/stable/docker-registry/Chart.yaml +++ b/stable/docker-registry/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 description: A Helm chart for Docker Registry name: docker-registry -version: 1.6.1 +version: 1.6.2 appVersion: 2.6.2 home: https://hub.docker.com/_/registry/ icon: https://hub.docker.com/public/images/logos/mini-logo.svg diff --git a/stable/docker-registry/README.md b/stable/docker-registry/README.md index d9ff0c8f05..7615db9dde 100644 --- a/stable/docker-registry/README.md +++ b/stable/docker-registry/README.md @@ -65,7 +65,8 @@ their default values. | `tolerations` | pod tolerations | `[]` | | `ingress.enabled` | If true, Ingress will be created | `false` | | `ingress.annotations` | Ingress annotations | `{}` | -| `ingress.path` | Ingress service path | `/` | +| `ingress.labels` | Ingress labels | `{}` | +| `ingress.path` | Ingress service path | `/` | | `ingress.hosts` | Ingress hostnames | `[]` | | `ingress.tls` | Ingress TLS configuration (YAML) | `[]` | diff --git a/stable/docker-registry/templates/ingress.yaml b/stable/docker-registry/templates/ingress.yaml index d5c315ef28..6fdf784c08 100644 --- a/stable/docker-registry/templates/ingress.yaml +++ b/stable/docker-registry/templates/ingress.yaml @@ -11,6 +11,9 @@ metadata: chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} release: {{ .Release.Name }} heritage: {{ .Release.Service }} +{{- if .Values.ingress.labels }} +{{ toYaml .Values.ingress.labels | indent 4 }} +{{- end }} annotations: {{- range $key, $value := .Values.ingress.annotations }} {{ $key }}: {{ $value | quote }} diff --git a/stable/docker-registry/values.yaml b/stable/docker-registry/values.yaml index 1931cb0de2..f72bd6b48b 100644 --- a/stable/docker-registry/values.yaml +++ b/stable/docker-registry/values.yaml @@ -34,6 +34,7 @@ ingress: annotations: # kubernetes.io/ingress.class: nginx # kubernetes.io/tls-acme: "true" + labels: {} tls: # Secrets must be manually created in the namespace. # - secretName: chart-example-tls