From fc5107993cab73cbe78fda658c792d805166b9ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20R=C3=BCger?= Date: Tue, 17 Dec 2019 15:24:00 +0100 Subject: [PATCH] [stable/coredns] Add support for customLabels / Upgrade to 1.6.6 (#17966) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * [stable/coredns] Add support for customLabels Signed-off-by: Manuel Rüger * [stable/coredns] Version bump to 1.6.6 Signed-off-by: Manuel Rüger --- stable/coredns/Chart.yaml | 4 ++-- stable/coredns/README.md | 4 ++-- stable/coredns/templates/deployment.yaml | 6 ++++++ stable/coredns/templates/service-metrics.yaml | 3 +++ stable/coredns/templates/service.yaml | 3 +++ stable/coredns/values.yaml | 5 ++++- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/stable/coredns/Chart.yaml b/stable/coredns/Chart.yaml index 8c4beefb13..4834611792 100644 --- a/stable/coredns/Chart.yaml +++ b/stable/coredns/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v1 name: coredns -version: 1.7.5 -appVersion: 1.6.5 +version: 1.8.0 +appVersion: 1.6.6 description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services keywords: - coredns diff --git a/stable/coredns/README.md b/stable/coredns/README.md index 5b7fd87e89..e0813bb956 100644 --- a/stable/coredns/README.md +++ b/stable/coredns/README.md @@ -47,7 +47,7 @@ The command removes all the Kubernetes components associated with the chart and | Parameter | Description | Default | |:----------------------------------------|:--------------------------------------------------------------------------------------|:------------------------------------------------------------| | `image.repository` | The image repository to pull from | coredns/coredns | -| `image.tag` | The image tag to pull from | `v1.6.5` | +| `image.tag` | The image tag to pull from | `v1.6.6` | | `image.pullPolicy` | Image pull policy | IfNotPresent | | `replicaCount` | Number of replicas | 1 | | `resources.limits.cpu` | Container maximum CPU | `100m` | @@ -74,7 +74,7 @@ The command removes all the Kubernetes components associated with the chart and | `tolerations` | Tolerations for pod assignment | [] | | `zoneFiles` | Configure custom Zone files | [] | | `extraSecrets` | Optional array of secrets to mount inside the CoreDNS container | [] | - +| `customLabels` | Optional labels for Deployment, Pod, Service, ServiceMonitor objects | {} | See `values.yaml` for configuration notes. Specify each parameter using the `--set key=value[,key=value]` argument to `helm install`. For example, ```console diff --git a/stable/coredns/templates/deployment.yaml b/stable/coredns/templates/deployment.yaml index 6115a85528..f61c9e31d0 100644 --- a/stable/coredns/templates/deployment.yaml +++ b/stable/coredns/templates/deployment.yaml @@ -12,6 +12,9 @@ metadata: kubernetes.io/name: "CoreDNS" {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 4 }} +{{- end }} spec: replicas: {{ .Values.replicaCount }} selector: @@ -29,6 +32,9 @@ spec: {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} app.kubernetes.io/instance: {{ .Release.Name | quote }} +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 8 }} +{{- end }} annotations: checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }} {{- if .Values.isClusterService }} diff --git a/stable/coredns/templates/service-metrics.yaml b/stable/coredns/templates/service-metrics.yaml index 249f9e9337..ae213c0437 100644 --- a/stable/coredns/templates/service-metrics.yaml +++ b/stable/coredns/templates/service-metrics.yaml @@ -14,6 +14,9 @@ metadata: {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} app.kubernetes.io/component: metrics +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 4 }} +{{- end }} annotations: {{ toYaml .Values.service.annotations | indent 4 }} spec: diff --git a/stable/coredns/templates/service.yaml b/stable/coredns/templates/service.yaml index a2864f6354..4098664bb9 100644 --- a/stable/coredns/templates/service.yaml +++ b/stable/coredns/templates/service.yaml @@ -12,6 +12,9 @@ metadata: kubernetes.io/name: "CoreDNS" {{- end }} app.kubernetes.io/name: {{ template "coredns.name" . }} +{{- if .Values.customLabels }} +{{ toYaml .Values.customLabels | indent 4 }} +{{- end }} annotations: {{ toYaml .Values.service.annotations | indent 4 }} spec: diff --git a/stable/coredns/values.yaml b/stable/coredns/values.yaml index 48fa7d1062..d3d5ad496a 100644 --- a/stable/coredns/values.yaml +++ b/stable/coredns/values.yaml @@ -4,7 +4,7 @@ image: repository: coredns/coredns - tag: "1.6.5" + tag: "1.6.6" pullPolicy: IfNotPresent replicaCount: 1 @@ -137,3 +137,6 @@ extraSecrets: [] # mountPath: /etc/coredns/tls/etcd # - name: some-fancy-secret # mountPath: /etc/wherever + +# Custom labels to apply to Deployment, Pod, Service, ServiceMonitor +customLabels: {}