From eeee789c0003e4f86eb48119e9f02b4d86d031cc Mon Sep 17 00:00:00 2001 From: Vasily Sliouniaev Date: Tue, 13 Aug 2019 11:57:41 +0100 Subject: [PATCH] [stable/prometheus-operator] Fix several issues (#16264) * Fix some bugs Signed-off-by: Vasily Sliouniaev * Resync rules for GKE kube version Signed-off-by: Vasily Sliouniaev * Add docs for GKE private clusters Signed-off-by: Vasily Sliouniaev --- stable/prometheus-operator/Chart.yaml | 2 +- stable/prometheus-operator/README.md | 10 ++++++++++ stable/prometheus-operator/ci/test-values.yaml | 9 ++++++--- .../hack/sync_grafana_dashboards.py | 16 ++++++++-------- .../hack/sync_prometheus_rules.py | 16 ++++++++-------- .../grafana/dashboards-1.14/apiserver.yaml | 2 +- .../dashboards-1.14/controller-manager.yaml | 2 +- .../templates/grafana/dashboards-1.14/etcd.yaml | 2 +- .../dashboards-1.14/k8s-cluster-rsrc-use.yaml | 2 +- .../dashboards-1.14/k8s-node-rsrc-use.yaml | 2 +- .../dashboards-1.14/k8s-resources-cluster.yaml | 2 +- .../dashboards-1.14/k8s-resources-namespace.yaml | 2 +- .../dashboards-1.14/k8s-resources-pod.yaml | 2 +- .../dashboards-1.14/k8s-resources-workload.yaml | 2 +- .../k8s-resources-workloads-namespace.yaml | 2 +- .../grafana/dashboards-1.14/kubelet.yaml | 2 +- .../templates/grafana/dashboards-1.14/nodes.yaml | 2 +- .../dashboards-1.14/persistentvolumesusage.yaml | 2 +- .../templates/grafana/dashboards-1.14/pods.yaml | 2 +- .../dashboards-1.14/prometheus-remote-write.yaml | 2 +- .../grafana/dashboards-1.14/prometheus.yaml | 2 +- .../templates/grafana/dashboards-1.14/proxy.yaml | 2 +- .../grafana/dashboards-1.14/scheduler.yaml | 2 +- .../grafana/dashboards-1.14/statefulset.yaml | 2 +- .../templates/grafana/dashboards/etcd.yaml | 2 +- .../grafana/dashboards/k8s-cluster-rsrc-use.yaml | 2 +- .../grafana/dashboards/k8s-node-rsrc-use.yaml | 2 +- .../dashboards/k8s-resources-cluster.yaml | 2 +- .../dashboards/k8s-resources-namespace.yaml | 2 +- .../grafana/dashboards/k8s-resources-pod.yaml | 2 +- .../dashboards/k8s-resources-workload.yaml | 2 +- .../k8s-resources-workloads-namespace.yaml | 2 +- .../templates/grafana/dashboards/nodes.yaml | 2 +- .../dashboards/persistentvolumesusage.yaml | 2 +- .../templates/grafana/dashboards/pods.yaml | 2 +- .../grafana/dashboards/statefulset.yaml | 2 +- .../job-patch/job-createSecret.yaml | 8 ++++++++ .../job-patch/job-patchWebhook.yaml | 8 ++++++++ .../rules-1.14/alertmanager.rules.yaml | 2 +- .../templates/prometheus/rules-1.14/etcd.yaml | 2 +- .../prometheus/rules-1.14/general.rules.yaml | 2 +- .../prometheus/rules-1.14/k8s.rules.yaml | 2 +- .../rules-1.14/kube-apiserver.rules.yaml | 2 +- .../kube-prometheus-node-alerting.rules.yaml | 2 +- .../kube-prometheus-node-recording.rules.yaml | 2 +- .../rules-1.14/kube-scheduler.rules.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-absent.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-apps.yaml | 2 +- .../rules-1.14/kubernetes-resources.yaml | 2 +- .../rules-1.14/kubernetes-storage.yaml | 2 +- .../prometheus/rules-1.14/kubernetes-system.yaml | 2 +- .../prometheus/rules-1.14/node-network.yaml | 2 +- .../prometheus/rules-1.14/node-time.yaml | 2 +- .../prometheus/rules-1.14/node.rules.yaml | 2 +- .../rules-1.14/prometheus-operator.yaml | 2 +- .../prometheus/rules-1.14/prometheus.yaml | 2 +- .../prometheus/rules/alertmanager.rules.yaml | 2 +- .../templates/prometheus/rules/etcd.yaml | 2 +- .../prometheus/rules/general.rules.yaml | 2 +- .../templates/prometheus/rules/k8s.rules.yaml | 2 +- .../prometheus/rules/kube-apiserver.rules.yaml | 2 +- .../kube-prometheus-node-alerting.rules.yaml | 2 +- .../kube-prometheus-node-recording.rules.yaml | 2 +- .../prometheus/rules/kube-scheduler.rules.yaml | 2 +- .../prometheus/rules/kubernetes-absent.yaml | 2 +- .../prometheus/rules/kubernetes-apps.yaml | 2 +- .../prometheus/rules/kubernetes-resources.yaml | 2 +- .../prometheus/rules/kubernetes-storage.yaml | 2 +- .../prometheus/rules/kubernetes-system.yaml | 2 +- .../templates/prometheus/rules/node-network.yaml | 2 +- .../templates/prometheus/rules/node-time.yaml | 2 +- .../templates/prometheus/rules/node.rules.yaml | 2 +- .../prometheus/rules/prometheus-operator.yaml | 2 +- .../prometheus/rules/prometheus.rules.yaml | 2 +- stable/prometheus-operator/values.yaml | 9 ++++++--- 75 files changed, 122 insertions(+), 90 deletions(-) diff --git a/stable/prometheus-operator/Chart.yaml b/stable/prometheus-operator/Chart.yaml index 3f2b725ed6bc..965ad357c8bc 100644 --- a/stable/prometheus-operator/Chart.yaml +++ b/stable/prometheus-operator/Chart.yaml @@ -11,7 +11,7 @@ name: prometheus-operator sources: - https://github.com/coreos/prometheus-operator - https://coreos.com/operators/prometheus -version: 6.5.0 +version: 6.6.0 appVersion: 0.31.1 home: https://github.com/coreos/prometheus-operator keywords: diff --git a/stable/prometheus-operator/README.md b/stable/prometheus-operator/README.md index 339553a54c63..680505c1532e 100644 --- a/stable/prometheus-operator/README.md +++ b/stable/prometheus-operator/README.md @@ -69,6 +69,13 @@ kubectl delete crd alertmanagers.monitoring.coreos.com ## Work-Arounds for Known Issues +### Running on private GKE clusters +When Google configure the control plane for private clusters, they automatically configure VPC peering between your Kubernetes cluster’s network and a separate Google managed project. In order to restrict what Google are able to access within your cluster, the firewall rules configured restrict access to your Kubernetes pods. This means that in order to use the webhook component with a GKE private cluster, you must configure an additional firewall rule to allow the GKE control plane access to your webhook pod. + +You can read more information on how to add firewall rules for the GKE control plane nodes in the [GKE docs](https://cloud.google.com/kubernetes-engine/docs/how-to/private-clusters#add_firewall_rules) + +Alternatively, you can disable the hooks by setting `prometheusOperator.admissionWebhooks.enabled=false`. + ### Helm fails to create CRDs Due to a bug in helm, it is possible for the 4 CRDs that are created by this chart to fail to get fully deployed before Helm attempts to create resources that require them. This affects all versions of Helm with a [potential fix pending](https://github.com/helm/helm/pull/5112). In order to work around this issue when installing the chart you will need to make sure all 4 CRDs exist in the cluster first and disable their previsioning by the chart: @@ -200,6 +207,9 @@ The following tables list the configurable parameters of the prometheus-operator | `prometheusOperator.admissionWebhooks.patch.image.tag` | Tag to use for the webhook integration jobs | `v1.0.0` | | `prometheusOperator.admissionWebhooks.patch.image.pullPolicy` | Image pull policy for the webhook integration jobs | `IfNotPresent` | | `prometheusOperator.admissionWebhooks.patch.priorityClassName` | Priority class for the webhook integration jobs | `nil` | +| `prometheusOperator.admissionWebhooks.patch.podAnnotations` | Annotations for the webhook job pods | `nil` | +| `prometheusOperator.admissionWebhooks.patch.nodeSelector` | Node selector for running admission hook patch jobs | `nil` | + ### Prometheus | Parameter | Description | Default | diff --git a/stable/prometheus-operator/ci/test-values.yaml b/stable/prometheus-operator/ci/test-values.yaml index 120b0ef4efff..7bfb8ced3155 100644 --- a/stable/prometheus-operator/ci/test-values.yaml +++ b/stable/prometheus-operator/ci/test-values.yaml @@ -949,9 +949,12 @@ prometheusOperator: repository: jettech/kube-webhook-certgen tag: v1.0.0 pullPolicy: IfNotPresent - ## Provide a priority class name to the webhook patching job - ## - priorityClassName: "" + ## Provide a priority class name to the webhook patching job + ## + priorityClassName: "" + podAnnotations: {} + nodeSelector: {} + ## Service account for Alertmanager to use. ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/ diff --git a/stable/prometheus-operator/hack/sync_grafana_dashboards.py b/stable/prometheus-operator/hack/sync_grafana_dashboards.py index 293ac515e033..57c38aedf79b 100755 --- a/stable/prometheus-operator/hack/sync_grafana_dashboards.py +++ b/stable/prometheus-operator/hack/sync_grafana_dashboards.py @@ -29,29 +29,29 @@ def new_representer(dumper, data): 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards-1.14', 'type': 'yaml', - 'min_kubernetes': '1.14.0', - 'max_kubernetes': '1.16.0' + 'min_kubernetes': '1.14.0-0', + 'max_kubernetes': '1.16.0-0' }, { 'source': 'https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json', 'destination': '../templates/grafana/dashboards-1.14', 'type': 'json', - 'min_kubernetes': '1.14.0', - 'max_kubernetes': '1.16.0' + 'min_kubernetes': '1.14.0-0', + 'max_kubernetes': '1.16.0-0' }, { 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml', 'destination': '../templates/grafana/dashboards', 'type': 'yaml', - 'min_kubernetes': '1.11.0', - 'max_kubernetes': '1.14.0' + 'min_kubernetes': '1.11.0-0', + 'max_kubernetes': '1.14.0-0' }, { 'source': 'https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json', 'destination': '../templates/grafana/dashboards', 'type': 'json', - 'min_kubernetes': '1.11.0', - 'max_kubernetes': '1.14.0' + 'min_kubernetes': '1.11.0-0', + 'max_kubernetes': '1.14.0-0' }, ] diff --git a/stable/prometheus-operator/hack/sync_prometheus_rules.py b/stable/prometheus-operator/hack/sync_prometheus_rules.py index c932e2704344..44d9326bac75 100755 --- a/stable/prometheus-operator/hack/sync_prometheus_rules.py +++ b/stable/prometheus-operator/hack/sync_prometheus_rules.py @@ -27,26 +27,26 @@ def new_representer(dumper, data): { 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules-1.14', - 'min_kubernetes': '1.14.0', - 'max_kubernetes': '1.16.0' + 'min_kubernetes': '1.14.0-0', + 'max_kubernetes': '1.16.0-0' }, { 'source': 'https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml', 'destination': '../templates/prometheus/rules-1.14', - 'min_kubernetes': '1.14.0', - 'max_kubernetes': '1.16.0' + 'min_kubernetes': '1.14.0-0', + 'max_kubernetes': '1.16.0-0' }, { 'source': 'https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml', 'destination': '../templates/prometheus/rules', - 'min_kubernetes': '1.11.0', - 'max_kubernetes': '1.14.0' + 'min_kubernetes': '1.11.0-0', + 'max_kubernetes': '1.14.0-0' }, { 'source': 'https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml', 'destination': '../templates/prometheus/rules', - 'min_kubernetes': '1.11.0', - 'max_kubernetes': '1.14.0' + 'min_kubernetes': '1.11.0-0', + 'max_kubernetes': '1.14.0-0' }, ] diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml index 550278bd2999..5c4d90728a24 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/apiserver.yaml @@ -1,7 +1,7 @@ # Generated from 'apiserver' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeApiServer.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeApiServer.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml index c120175c1996..994eb7838f6f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/controller-manager.yaml @@ -1,7 +1,7 @@ # Generated from 'controller-manager' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeControllerManager.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeControllerManager.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml index ed2842c7b3ed..4f354b473582 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/etcd.yaml @@ -1,7 +1,7 @@ # Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-cluster-rsrc-use.yaml index d5dc33945500..c8f91ddebfdd 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-cluster-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-cluster-rsrc-use.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-node-rsrc-use.yaml index b71ba5f41f4a..e4426b350d0a 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-node-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-node-rsrc-use.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml index a4be71b120d5..a5f30520c32a 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-cluster.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml index f677175e25d7..7a02627c5766 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-namespace.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml index 9325a0897e44..1c6cba1673f3 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-pod.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml index ce5761c4ed50..34eed722ce7e 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workload.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml index 0a2fa7beb556..fdedb83d6f84 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/k8s-resources-workloads-namespace.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml index c0c8db0224ed..bffa2d23f9f5 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/kubelet.yaml @@ -1,7 +1,7 @@ # Generated from 'kubelet' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubelet.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubelet.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml index e15b355016fd..ccfb3e100a9f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/nodes.yaml @@ -1,7 +1,7 @@ # Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml index 54006d1fc6f6..29124681c8f2 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/persistentvolumesusage.yaml @@ -1,7 +1,7 @@ # Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pods.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pods.yaml index 6e1a5246395b..215a4ce41aea 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/pods.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/pods.yaml @@ -1,7 +1,7 @@ # Generated from 'pods' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml index 6081c93d41ce..7a0393be7f4b 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus-remote-write.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus-remote-write' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml index 88f98d31cf19..a4746939e66a 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/prometheus.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml index 97556044c12f..a6fcadf9478e 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/proxy.yaml @@ -1,7 +1,7 @@ # Generated from 'proxy' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeProxy.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml index f247a786513f..736b774251ad 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/scheduler.yaml @@ -1,7 +1,7 @@ # Generated from 'scheduler' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeScheduler.enabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeScheduler.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml index 5cf496addb7f..c225a31b6af4 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards-1.14/statefulset.yaml @@ -1,7 +1,7 @@ # Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml index b554ea665ea5..0c6ada758cc2 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/etcd.yaml @@ -1,7 +1,7 @@ # Generated from 'etcd' from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/grafana.json # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled .Values.kubeEtcd.enabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml index c08f880de912..713b67a7268f 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-cluster-rsrc-use.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-cluster-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml index 5b2b55c18bc2..b18f09b5e62c 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-node-rsrc-use.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-node-rsrc-use' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml index fff5c2438a6d..eea356d6c0b0 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-cluster.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-cluster' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml index 7e46a88f9a3e..9dd09a67dc7c 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-namespace.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml index 8b5c5f75bf8d..7bd479b31d69 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-pod.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-pod' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml index 0c809d0dbc99..0adbe27a3f78 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workload.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-workload' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml index 7b0485b70eb1..79fd86094655 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/k8s-resources-workloads-namespace.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s-resources-workloads-namespace' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml index ef0efc469fc6..3595b25cce33 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/nodes.yaml @@ -1,7 +1,7 @@ # Generated from 'nodes' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml index 262830d60ada..452d43ba0bd3 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/persistentvolumesusage.yaml @@ -1,7 +1,7 @@ # Generated from 'persistentvolumesusage' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml index 01aa4a383197..34a554d802ec 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/pods.yaml @@ -1,7 +1,7 @@ # Generated from 'pods' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml index e44e20649a88..a0dbbcf35d9d 100644 --- a/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml +++ b/stable/prometheus-operator/templates/grafana/dashboards/statefulset.yaml @@ -1,7 +1,7 @@ # Generated from 'statefulset' from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/grafana-dashboardDefinitions.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.grafana.enabled .Values.grafana.defaultDashboardsEnabled }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml index 6eca0435095a..5d1438a83d2f 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-createSecret.yaml @@ -14,6 +14,10 @@ spec: template: metadata: name: {{ template "prometheus-operator.fullname" . }}-admission-create +{{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} + annotations: +{{ toYaml . | indent 8 }} +{{- end }} labels: app: {{ template "prometheus-operator.name" $ }}-admission-create {{- include "prometheus-operator.labels" $ | indent 8 }} @@ -32,6 +36,10 @@ spec: - --secret-name={{ template "prometheus-operator.fullname" . }}-admission restartPolicy: OnFailure serviceAccountName: {{ template "prometheus-operator.fullname" . }}-admission + {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} securityContext: runAsNonRoot: true runAsUser: 2000 diff --git a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml index 7adde796553e..a05fdb05c659 100644 --- a/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml +++ b/stable/prometheus-operator/templates/prometheus-operator/admission-webhooks/job-patch/job-patchWebhook.yaml @@ -14,6 +14,10 @@ spec: template: metadata: name: {{ template "prometheus-operator.fullname" . }}-admission-patch +{{- with .Values.prometheusOperator.admissionWebhooks.patch.podAnnotations }} + annotations: +{{ toYaml . | indent 8 }} +{{- end }} labels: app: {{ template "prometheus-operator.name" $ }}-admission-patch {{- include "prometheus-operator.labels" $ | indent 8 }} @@ -33,6 +37,10 @@ spec: - --patch-failure-policy={{ .Values.prometheusOperator.admissionWebhooks.failurePolicy }} restartPolicy: OnFailure serviceAccountName: {{ template "prometheus-operator.fullname" . }}-admission + {{- with .Values.prometheusOperator.admissionWebhooks.patch.nodeSelector }} + nodeSelector: +{{ toYaml . | indent 8 }} + {{- end }} securityContext: runAsNonRoot: true runAsUser: 2000 diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml index 279ac7dd8f52..4d6894e12ef6 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/alertmanager.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} {{- $namespace := .Release.Namespace }} diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml index 0675fa74ce79..64b1f3941da8 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/etcd.yaml @@ -1,7 +1,7 @@ # Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml index e97e109af893..a5de61cb7395 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/general.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml index d690defb1e0c..f0a67b426050 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/k8s.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml index 435d93cfb85b..c5ce4d860243 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-apiserver.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-alerting.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-alerting.rules.yaml index e20a000c953c..25590e75df08 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-alerting.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-alerting.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml index 5916f7b4383d..4425883f1ad4 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-prometheus-node-recording.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml index d8b97c85c48a..30a133eb6a91 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kube-scheduler.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-absent.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-absent.yaml index 6d42e23b94f6..efe43a62836f 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-absent.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-absent.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml index 6805234cafee..de744fa6326e 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-apps.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml index 01c39d3c41d1..4cec11801c2a 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-resources.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml index 56003ca7d980..819dcb7c8400 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-storage.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml index 0bde6a97006a..c61ddee1fc42 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/kubernetes-system.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml index f7ef004ea64d..9a9a40220518 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-network.yaml @@ -1,7 +1,7 @@ # Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-time.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-time.yaml index 64ac3418df53..8ba097408d06 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node-time.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node-time.yaml @@ -1,7 +1,7 @@ # Generated from 'node-time' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml index fc099d00cf8f..80e7700a83a8 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/node.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml index 02b90758a249..e28c9cdcc16f 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus-operator.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $namespace := .Release.Namespace }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} diff --git a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml index 5faad2421b4e..09cce36c523c 100644 --- a/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules-1.14/prometheus.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus' group from https://raw.githubusercontent.com/coreos/kube-prometheus/master/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.14.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create }} +{{- if and (semverCompare ">=1.14.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.16.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create }} {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} {{- $namespace := .Release.Namespace }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} diff --git a/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml index c07f4c5834b9..aae16c3c5a81 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/alertmanager.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'alertmanager.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.alertmanager }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} {{- $namespace := .Release.Namespace }} diff --git a/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml b/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml index f635c0e60c9d..43f749cea5c6 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/etcd.yaml @@ -1,7 +1,7 @@ # Generated from 'etcd' group from https://raw.githubusercontent.com/etcd-io/etcd/master/Documentation/op-guide/etcd3_alert.rules.yml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeEtcd.enabled .Values.defaultRules.rules.etcd }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml index 8cbb36c61d38..2aa71a94b2cc 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/general.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'general.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.general }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml index 115bf5df894e..b6ff39b9a4da 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/k8s.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'k8s.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.k8s }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml index 7215dce8f509..2a441561b38b 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kube-apiserver.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-apiserver.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeApiServer.enabled .Values.defaultRules.rules.kubeApiserver }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml index f8de38bdb2ec..2a78ddc02629 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-alerting.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-prometheus-node-alerting.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeAlerting }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml index 06944c198744..477907676302 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kube-prometheus-node-recording.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-prometheus-node-recording.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubePrometheusNodeRecording }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml index 485271564bfc..134666f4c059 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kube-scheduler.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'kube-scheduler.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeScheduler.enabled .Values.defaultRules.rules.kubeScheduler }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml index 0e010e8ba0a3..3dc8f545484d 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-absent.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-absent' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesAbsent }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} {{- $alertmanagerJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "alertmanager" }} diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml index ced8bf903731..629099e59c60 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-apps.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-apps' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.kubeStateMetrics.enabled .Values.defaultRules.rules.kubernetesApps }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml index fb29ab8a7762..c6f70209a012 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-resources.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-resources' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesResources }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml index 091998ffde6f..ab94cd84abb6 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-storage.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-storage' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesStorage }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml index 7ca7ad5ee691..bd7487c3be7a 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/kubernetes-system.yaml @@ -1,7 +1,7 @@ # Generated from 'kubernetes-system' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.kubernetesSystem }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml index 3f3144b51bb0..c1e43ef78b4c 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/node-network.yaml @@ -1,7 +1,7 @@ # Generated from 'node-network' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.network }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml index 925104c0dae5..2e06d2c47ebf 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/node-time.yaml @@ -1,7 +1,7 @@ # Generated from 'node-time' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.time }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml index 3b13f77a79de..dde575005abf 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/node.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'node.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.nodeExporter.enabled .Values.defaultRules.rules.node }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} kind: PrometheusRule metadata: diff --git a/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml b/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml index f65da0c59e3f..c0be860a8416 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/prometheus-operator.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus-operator' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheusOperator }} {{- $operatorJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "operator" }} {{- $namespace := .Release.Namespace }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} diff --git a/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml b/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml index a6962c29f225..7acf3d209920 100644 --- a/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml +++ b/stable/prometheus-operator/templates/prometheus/rules/prometheus.rules.yaml @@ -1,7 +1,7 @@ # Generated from 'prometheus.rules' group from https://raw.githubusercontent.com/coreos/kube-prometheus/release-0.1/manifests/prometheus-rules.yaml # 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 -{{- if and (semverCompare ">=1.11.0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} +{{- if and (semverCompare ">=1.11.0-0" .Capabilities.KubeVersion.GitVersion) (semverCompare "<1.14.0-0" .Capabilities.KubeVersion.GitVersion) .Values.defaultRules.create .Values.defaultRules.rules.prometheus }} {{- $prometheusJob := printf "%s-%s" (include "prometheus-operator.fullname" .) "prometheus" }} {{- $namespace := .Release.Namespace }} apiVersion: {{ printf "%s/v1" (.Values.prometheusOperator.crdApiGroup | default "monitoring.coreos.com") }} diff --git a/stable/prometheus-operator/values.yaml b/stable/prometheus-operator/values.yaml index 2b93f7a47a3b..dbe42662522c 100644 --- a/stable/prometheus-operator/values.yaml +++ b/stable/prometheus-operator/values.yaml @@ -949,9 +949,12 @@ prometheusOperator: repository: jettech/kube-webhook-certgen tag: v1.0.0 pullPolicy: IfNotPresent - ## Provide a priority class name to the webhook patching job - ## - priorityClassName: "" + ## Provide a priority class name to the webhook patching job + ## + priorityClassName: "" + podAnnotations: {} + nodeSelector: {} + ## Service account for Alertmanager to use. ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/configure-service-account/