[stable/prometheus-operator] add apiserverConfig (#20453)

* [stable/prometheus-operator] add apiserverConfig
    * add apiserverConfig

Signed-off-by: Heechul Ryu <ryuhcii@gmail.com>

* Bump stable/prometheus-operator chart version to 8.7.0

Signed-off-by: Heechul Ryu <ryuhcii@gmail.com>
This commit is contained in:
Heechul Ryu
2020-01-31 06:58:20 -08:00
committed by GitHub
parent f9eedf2064
commit a97695fcdf
4 changed files with 10 additions and 2 deletions
+1 -1
View File
@@ -12,7 +12,7 @@ sources:
- https://github.com/coreos/kube-prometheus
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 8.6.0
version: 8.7.0
appVersion: 0.35.0
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
+1
View File
@@ -264,6 +264,7 @@ The following tables list the configurable parameters of the prometheus-operator
| `prometheus.prometheusSpec.additionalPrometheusSecretsAnnotations` | additionalPrometheusSecretsAnnotations allows to add annotations to the kubernetes secret. This can be useful when deploying via spinnaker to disable versioning on the secret, strategy.spinnaker.io/versioned: 'false' | `{}` |
| `prometheus.prometheusSpec.affinity` | Assign custom affinity rules to the prometheus instance https://kubernetes.io/docs/concepts/configuration/assign-pod-node/ | `{}` |
| `prometheus.prometheusSpec.alertingEndpoints` | Alertmanagers to which alerts will be sent https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#alertmanagerendpoints Default configuration will connect to the alertmanager deployed as part of this release | `[]` |
| `prometheus.prometheusSpec.apiserverConfig` | Custom `kubernetes_sd_config` https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#apiserverconfig Default configuration will connect to current Kubernetes cluster | `{}` |
| `prometheus.prometheusSpec.configMaps` | ConfigMaps is a list of ConfigMaps in the same namespace as the Prometheus object, which shall be mounted into the Prometheus Pods. The ConfigMaps are mounted into /etc/prometheus/configmaps/ | `[]` |
| `prometheus.prometheusSpec.containers` | Containers allows injecting additional containers. This is meant to allow adding an authentication proxy to a Prometheus pod. |`[]`|
| `prometheus.prometheusSpec.disableCompaction` | If true, pass --storage.tsdb.max-block-duration=2h to prometheus. This is already done if using Thanos |`false`|
@@ -27,6 +27,10 @@ spec:
{{- else }}
[]
{{- end }}
{{- if .Values.prometheus.prometheusSpec.apiserverConfig }}
apiserverConfig:
{{ toYaml .Values.prometheus.prometheusSpec.apiserverConfig | indent 4}}
{{- end }}
{{- if .Values.prometheus.prometheusSpec.image }}
baseImage: {{ .Values.prometheus.prometheusSpec.image.repository }}
version: {{ .Values.prometheus.prometheusSpec.image.tag }}
+4 -1
View File
@@ -1382,10 +1382,13 @@ prometheus:
## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#prometheusspec
##
prometheusSpec:
## If true, pass --storage.tsdb.max-block-duration=2h to prometheus. This is already done if using Thanos
##
disableCompaction: false
## APIServerConfig
## ref: https://github.com/coreos/prometheus-operator/blob/master/Documentation/api.md#apiserverconfig
##
apiserverConfig: {}
## Interval between consecutive scrapes.
##