[stable/coredns] separate creation of prometheus service from operator

stable/coredns/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v1
 name: coredns
-version: 1.12.0
+version: 1.13.0
 appVersion: 1.6.9
 description: CoreDNS is a DNS server that chains plugins and provides Kubernetes DNS Services
 keywords:

stable/coredns/README.md

@@ -55,6 +55,8 @@ The command removes all the Kubernetes components associated with the chart and
 | `resources.requests.cpu`                | Container requested CPU                                                               | `100m`                                                      |
 | `resources.requests.memory`             | Container requested memory                                                            | `128Mi`                                                     |
 | `serviceType`                           | Kubernetes Service type                                                               | `ClusterIP`                                                 |
+| `prometheus.service.enabled`            | Set this to `true` to create Service for Prometheus metrics                           | `false`                                                     |
+| `prometheus.service.annotations`        | Annotations to add to the metrics Service                                             | `{prometheus.io/scrape: "true", prometheus.io/port: "9153"}`|
 | `prometheus.monitor.enabled`            | Set this to `true` to create ServiceMonitor for Prometheus operator                   | `false`                                                     |
 | `prometheus.monitor.additionalLabels`   | Additional labels that can be used so ServiceMonitor will be discovered by Prometheus | {}                                                          |
 | `prometheus.monitor.namespace`          | Selector to select which namespaces the Endpoints objects are discovered from.        | `""`                                                        |

stable/coredns/templates/service-metrics.yaml

@@ -1,4 +1,4 @@
-{{- if .Values.prometheus.monitor.enabled }}
+{{- if .Values.prometheus.service.enabled }}
 apiVersion: v1
 kind: Service
 metadata:
@@ -18,7 +18,7 @@ metadata:
 {{ toYaml .Values.customLabels | indent 4 }}
 {{- end }}
   annotations:
-{{ toYaml .Values.service.annotations | indent 4 }}
+{{ toYaml .Values.prometheus.service.annotations | indent 4 }}
 spec:
   selector:
     app.kubernetes.io/instance: {{ .Release.Name | quote }}

stable/coredns/values.yaml

@@ -20,6 +20,11 @@ resources:
 serviceType: "ClusterIP"
 
 prometheus:
+  service:
+    enabled: false
+    annotations:
+      prometheus.io/scrape: "true"
+      prometheus.io/port: "9153"
   monitor:
     enabled: false
     additionalLabels: {}