[stable/prometheus-adapter] Added pod annotations to chart. (#16446)

* [stable/prometheus-adapter] Added pod annotations to chart. Upgraded chart to latest version of image

Signed-off-by: Aaron Mell <amell@lumindigital.com>

* [stable/prometheus-adapter] Added pod annotations to chart. Upgraded chart to latest version of image

Signed-off-by: Aaron Mell <amell@lumindigital.com>

* Fixing code review issues

Signed-off-by: Aaron Mell <amell@lumindigital.com>

* Removed v from chart.yaml, changed indent to nindent. Added trim to prevent extra line after annotation.
Signed-off-by: Aaron Mell <amell@lumindigital.com>

* Signed-off-by: Aaron Mell <amell@lumindigital.com>
This commit is contained in:
Aaron Mell
2019-08-22 08:26:34 -07:00
committed by Kubernetes Prow Robot
parent 2aba9c4642
commit db62a6c595
4 changed files with 8 additions and 1 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
apiVersion: v1
name: prometheus-adapter
version: 1.2.0
version: 1.3.0
appVersion: v0.5.0
description: A Helm chart for k8s prometheus adapter
home: https://github.com/DirectXMan12/k8s-prometheus-adapter
+1
View File
@@ -114,6 +114,7 @@ The following table lists the configurable parameters of the Prometheus Adapter
| `logLevel` | Log level | `4` |
| `metricsRelistInterval` | Interval at which to re-list the set of all available metrics from Prometheus | `1m` |
| `nodeSelector` | Node labels for pod assignment | `{}` |
| `podAnnotations` | Annotations to add to the pod | `{}` |
| `priorityClassName` | Pod priority | `` |
| `prometheus.url` | Url of where we can find the Prometheus service | `http://prometheus.default.svc` |
| `prometheus.port` | Port of where we can find the Prometheus service, zero to omit this option | `9090` |
@@ -23,6 +23,9 @@ spec:
name: {{ template "k8s-prometheus-adapter.name" . }}
annotations:
checksum/config: {{ include (print $.Template.BasePath "/custom-metrics-configmap.yaml") . | sha256sum }}
{{- with .Values.podAnnotations }}
{{- toYaml . | trim | nindent 8 }}
{{- end }}
spec:
serviceAccountName: {{ template "k8s-prometheus-adapter.serviceAccountName" . }}
containers:
+3
View File
@@ -103,3 +103,6 @@ tls:
# Public key of the APIService
tolerations: []
# Annotations added to the pod
podAnnotations: {}