mirror of
https://github.com/helm/charts.git
synced 2026-08-23 22:37:45 +00:00
[stable/prometheus-operator ] Bump operator version, update dependencies (#20572)
* Fix CRD annotations, bump operator version Alter port on node-exporter because CI is down Signed-off-by: vas <vasily.sliouniaev@jet.com> * Update dependent charts to latest Signed-off-by: vas <vasily.sliouniaev@jet.com> * Update readme and cleanup-attempt template Signed-off-by: vas <vasily.sliouniaev@jet.com>
This commit is contained in:
@@ -12,7 +12,7 @@ sources:
|
||||
- https://github.com/coreos/kube-prometheus
|
||||
- https://github.com/coreos/prometheus-operator
|
||||
- https://coreos.com/operators/prometheus
|
||||
version: 8.9.3
|
||||
version: 8.10.0
|
||||
appVersion: 0.36.0
|
||||
tillerVersion: ">=2.12.0"
|
||||
home: https://github.com/coreos/prometheus-operator
|
||||
|
||||
@@ -81,11 +81,12 @@ You should upgrade to Helm 2.14 + in order to avoid this issue. However, if you
|
||||
|
||||
1. Create CRDs
|
||||
```console
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.35/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_alertmanagers.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_podmonitors.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_prometheuses.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_prometheusrules.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_servicemonitors.yaml
|
||||
kubectl apply -f https://raw.githubusercontent.com/coreos/prometheus-operator/release-0.36/example/prometheus-operator-crd/monitoring.coreos.com_thanosrulers.yaml
|
||||
|
||||
```
|
||||
|
||||
@@ -199,7 +200,7 @@ The following tables list the configurable parameters of the prometheus-operator
|
||||
| `prometheusOperator.hyperkubeImage.tag` | Tag for hyperkube image used to perform maintenance tasks | `v1.12.1` |
|
||||
| `prometheusOperator.image.pullPolicy` | Pull policy for prometheus operator image | `IfNotPresent` |
|
||||
| `prometheusOperator.image.repository` | Repository for prometheus operator image | `quay.io/coreos/prometheus-operator` |
|
||||
| `prometheusOperator.image.tag` | Tag for prometheus operator image | `v0.35.0` |
|
||||
| `prometheusOperator.image.tag` | Tag for prometheus operator image | `v0.36.0` |
|
||||
| `prometheusOperator.kubeletService.enabled` | If true, the operator will create and maintain a service for scraping kubelets | `true` |
|
||||
| `prometheusOperator.kubeletService.namespace` | Namespace to deploy kubelet service | `kube-system` |
|
||||
| `prometheusOperator.logFormat` | Operator log output formatting | `"logfmt"` |
|
||||
@@ -209,7 +210,7 @@ The following tables list the configurable parameters of the prometheus-operator
|
||||
| `prometheusOperator.podLabels` | Labels to add to the operator pod | `{}` |
|
||||
| `prometheusOperator.priorityClassName` | Name of Priority Class to assign pods | `nil` |
|
||||
| `prometheusOperator.prometheusConfigReloaderImage.repository` | Repository for config-reloader image | `quay.io/coreos/prometheus-config-reloader` |
|
||||
| `prometheusOperator.prometheusConfigReloaderImage.tag` | Tag for config-reloader image | `v0.35.0` |
|
||||
| `prometheusOperator.prometheusConfigReloaderImage.tag` | Tag for config-reloader image | `v0.36.0` |
|
||||
| `prometheusOperator.resources` | Resource limits for prometheus operator | `{}` |
|
||||
| `prometheusOperator.securityContext` | SecurityContext for prometheus operator | `{"runAsNonRoot": true, "runAsUser": 65534}` |
|
||||
| `prometheusOperator.service.annotations` | Annotations to be added to the prometheus operator service | `{}` |
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,12 +1,12 @@
|
||||
dependencies:
|
||||
- name: kube-state-metrics
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 2.6.3
|
||||
version: 2.6.4
|
||||
- name: prometheus-node-exporter
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 1.8.1
|
||||
version: 1.8.2
|
||||
- name: grafana
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
version: 4.3.2
|
||||
digest: sha256:bc0c2cbaabe54e2ba80bddaad77aa104ab2ec8626b8cbf881201a2335aa0f1a4
|
||||
generated: "2020-01-29T10:25:05.191994Z"
|
||||
version: 5.0.0
|
||||
digest: sha256:91fd7999520c95c52890b552bc27a4abfcd78372c3fa4e7432756319b952c032
|
||||
generated: "2020-02-20T22:37:18.238253Z"
|
||||
|
||||
@@ -1,16 +1,16 @@
|
||||
dependencies:
|
||||
|
||||
- name: kube-state-metrics
|
||||
version: 2.6.*
|
||||
version: "2.6.*"
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
condition: kubeStateMetrics.enabled
|
||||
|
||||
- name: prometheus-node-exporter
|
||||
version: 1.8.*
|
||||
version: "1.8.*"
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
condition: nodeExporter.enabled
|
||||
|
||||
- name: grafana
|
||||
version: 4.3.*
|
||||
version: "5.0.*"
|
||||
repository: https://kubernetes-charts.storage.googleapis.com/
|
||||
condition: grafana.enabled
|
||||
|
||||
@@ -10,8 +10,8 @@ metadata:
|
||||
spec:
|
||||
selector:
|
||||
matchLabels:
|
||||
app: grafana
|
||||
release: {{ $.Release.Name | quote }}
|
||||
app.kubernetes.io/name: grafana
|
||||
app.kubernetes.io/instance: {{ $.Release.Name | quote }}
|
||||
namespaceSelector:
|
||||
matchNames:
|
||||
- {{ $.Release.Namespace | quote }}
|
||||
|
||||
@@ -40,5 +40,6 @@ spec:
|
||||
kubectl delete crd prometheusrules.monitoring.coreos.com;
|
||||
kubectl delete crd servicemonitors.monitoring.coreos.com;
|
||||
kubectl delete crd podmonitors.monitoring.coreos.com;
|
||||
kubectl delete crd thanosrulers.monitoring.coreos.com;
|
||||
restartPolicy: OnFailure
|
||||
{{- end }}
|
||||
|
||||
@@ -1180,7 +1180,7 @@ prometheusOperator:
|
||||
##
|
||||
image:
|
||||
repository: quay.io/coreos/prometheus-operator
|
||||
tag: v0.35.0
|
||||
tag: v0.36.0
|
||||
pullPolicy: IfNotPresent
|
||||
|
||||
## Configmap-reload image to use for reloading configmaps
|
||||
@@ -1193,7 +1193,7 @@ prometheusOperator:
|
||||
##
|
||||
prometheusConfigReloaderImage:
|
||||
repository: quay.io/coreos/prometheus-config-reloader
|
||||
tag: v0.35.0
|
||||
tag: v0.36.0
|
||||
|
||||
## Set the prometheus config reloader side-car CPU limit
|
||||
##
|
||||
|
||||
Reference in New Issue
Block a user