From 3865eacdb31b0edd20598b7f2931a83f1911b12b Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 9 Jul 2020 11:47:32 +0200 Subject: [PATCH 1/2] jsonnet/kube-prometheus: Bump default versions of prometheus and alertmanager --- jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 2 +- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 0fb1826d..4f39af39 100644 --- a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet +++ b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet @@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; namespace: 'default', versions+:: { - alertmanager: 'v0.20.0', + alertmanager: 'v0.21.0', }, imageRepos+:: { diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index 17e8bff7..bd128d2e 100644 --- a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet +++ b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet @@ -6,7 +6,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; namespace: 'default', versions+:: { - prometheus: 'v2.17.2', + prometheus: 'v2.19.2', }, imageRepos+:: { From 617003a583dd90b22caefd46f1439d5d3d246776 Mon Sep 17 00:00:00 2001 From: Lili Cosic Date: Thu, 9 Jul 2020 11:48:30 +0200 Subject: [PATCH 2/2] manifests: Regenerate files --- manifests/alertmanager-alertmanager.yaml | 4 ++-- manifests/prometheus-prometheus.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index 17ec2328..55b353a8 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -6,7 +6,7 @@ metadata: name: main namespace: monitoring spec: - image: quay.io/prometheus/alertmanager:v0.20.0 + image: quay.io/prometheus/alertmanager:v0.21.0 nodeSelector: kubernetes.io/os: linux replicas: 3 @@ -15,4 +15,4 @@ spec: runAsNonRoot: true runAsUser: 1000 serviceAccountName: alertmanager-main - version: v0.20.0 + version: v0.21.0 diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 9c364230..11a4c5d3 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -11,7 +11,7 @@ spec: - name: alertmanager-main namespace: monitoring port: web - image: quay.io/prometheus/prometheus:v2.17.2 + image: quay.io/prometheus/prometheus:v2.19.2 nodeSelector: kubernetes.io/os: linux podMonitorNamespaceSelector: {} @@ -31,4 +31,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: v2.17.2 + version: v2.19.2