github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/prometheus-operator] Prevent creating empty PrometheusRules. (#18619)

Browse Source 
* [stable/prometheus-operator] Prevent creating empty PrometheusRules.

Signed-off-by: Tiago Meireles <tiago.meireles7@outlook.com>

* Bump chart version.

Signed-off-by: Tiago Meireles <tiago.meireles7@outlook.com>
This commit is contained in:
tiagomeireles
2019-11-06 06:09:51 -08:00
committed by Kubernetes Prow Robot
parent 13b1c252c4
commit 6b3367d471
4 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-operator/Chart.yaml
+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.1.1
version: 8.1.2
appVersion: 0.34.0
tillerVersion: ">=2.12.0"
home: https://github.com/coreos/prometheus-operator
stable/prometheus-operator/hack/sync_prometheus_rules.py
+2
View File
@@ -61,6 +61,8 @@ condition_map = {
'kubernetes-resources': ' .Values.defaultRules.rules.kubernetesResources',
'kubernetes-storage': ' .Values.defaultRules.rules.kubernetesStorage',
'kubernetes-system': ' .Values.defaultRules.rules.kubernetesSystem',
'kubernetes-system-controller-manager': ' .Values.kubeControllerManager.enabled',
'kubernetes-system-scheduler': ' .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler',
'node-exporter.rules': ' .Values.nodeExporter.enabled .Values.defaultRules.rules.node',
'node-exporter': ' .Values.nodeExporter.enabled .Values.defaultRules.rules.node',
'node.rules': ' .Values.nodeExporter.enabled .Values.defaultRules.rules.node',
stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-controller-manager.yaml
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not change in-place! In order to change this file first read following link:
# https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create }}
{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeControllerManager.enabled }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata:
stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system-scheduler.yaml
+1 -1
View File
@@ -2,7 +2,7 @@
# Do not change in-place! In order to change this file first read following link:
# https://github.com/helm/charts/tree/master/stable/prometheus-operator/hack
{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create }}
{{- if and (semverCompare ">=1.14.0-0" $kubeTargetVersion) (semverCompare "<9.9.9-9" $kubeTargetVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }}
apiVersion: monitoring.coreos.com/v1
kind: PrometheusRule
metadata: