From bd20662d480d21d4a59d6252aabb01dec23a184f Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 28 Jan 2020 23:20:29 +0100 Subject: [PATCH 1/2] jsonnet: update component versions --- jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet | 2 +- .../kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet | 2 +- jsonnet/kube-prometheus/kube-prometheus.libsonnet | 2 +- .../kube-state-metrics/kube-state-metrics.libsonnet | 2 +- jsonnet/kube-prometheus/prometheus/prometheus.libsonnet | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet index 48ecc4a0..715d0c8c 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.18.0', + alertmanager: 'v0.20.0', }, imageRepos+:: { diff --git a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet index ebe9872b..07e99483 100644 --- a/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus-thanos-sidecar.libsonnet @@ -5,7 +5,7 @@ local servicePort = k.core.v1.service.mixin.spec.portsType; { _config+:: { versions+:: { - thanos: 'v0.7.0', + thanos: 'v0.10.0', }, imageRepos+:: { thanos: 'quay.io/thanos/thanos', diff --git a/jsonnet/kube-prometheus/kube-prometheus.libsonnet b/jsonnet/kube-prometheus/kube-prometheus.libsonnet index 324aa6ce..1d8aa826 100644 --- a/jsonnet/kube-prometheus/kube-prometheus.libsonnet +++ b/jsonnet/kube-prometheus/kube-prometheus.libsonnet @@ -46,7 +46,7 @@ local configMapList = k3.core.v1.configMapList; namespace: 'default', versions+:: { - grafana: '6.4.3', + grafana: '6.6.0', }, tlsCipherSuites: [ diff --git a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet index 2df625ec..d7a4cd51 100644 --- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet +++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet @@ -11,7 +11,7 @@ local k = import 'ksonnet/ksonnet.beta.4/k.libsonnet'; }, versions+:: { - kubeStateMetrics: 'v1.9.2', + kubeStateMetrics: 'v1.9.3', kubeRbacProxy: 'v0.4.1', }, diff --git a/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet b/jsonnet/kube-prometheus/prometheus/prometheus.libsonnet index bd76f608..2ea5f800 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.11.0', + prometheus: 'v2.15.2', }, imageRepos+:: { From 7bbec26ff33d264c48a3b90f1017db1483b7ba78 Mon Sep 17 00:00:00 2001 From: paulfantom Date: Tue, 28 Jan 2020 23:22:02 +0100 Subject: [PATCH 2/2] manifests: regenerate --- manifests/alertmanager-alertmanager.yaml | 2 +- manifests/grafana-deployment.yaml | 2 +- manifests/kube-state-metrics-deployment.yaml | 2 +- manifests/prometheus-prometheus.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/manifests/alertmanager-alertmanager.yaml b/manifests/alertmanager-alertmanager.yaml index a5bda1dc..87f98b33 100644 --- a/manifests/alertmanager-alertmanager.yaml +++ b/manifests/alertmanager-alertmanager.yaml @@ -15,4 +15,4 @@ spec: runAsNonRoot: true runAsUser: 1000 serviceAccountName: alertmanager-main - version: v0.18.0 + version: v0.20.0 diff --git a/manifests/grafana-deployment.yaml b/manifests/grafana-deployment.yaml index aec58617..5ccf92fc 100644 --- a/manifests/grafana-deployment.yaml +++ b/manifests/grafana-deployment.yaml @@ -16,7 +16,7 @@ spec: app: grafana spec: containers: - - image: grafana/grafana:6.4.3 + - image: grafana/grafana:6.6.0 name: grafana ports: - containerPort: 3000 diff --git a/manifests/kube-state-metrics-deployment.yaml b/manifests/kube-state-metrics-deployment.yaml index 660379aa..24c1e0c5 100644 --- a/manifests/kube-state-metrics-deployment.yaml +++ b/manifests/kube-state-metrics-deployment.yaml @@ -55,7 +55,7 @@ spec: - --port=8081 - --telemetry-host=127.0.0.1 - --telemetry-port=8082 - image: quay.io/coreos/kube-state-metrics:v1.9.2 + image: quay.io/coreos/kube-state-metrics:v1.9.3 name: kube-state-metrics resources: limits: diff --git a/manifests/prometheus-prometheus.yaml b/manifests/prometheus-prometheus.yaml index 72b462c0..1c8422d5 100644 --- a/manifests/prometheus-prometheus.yaml +++ b/manifests/prometheus-prometheus.yaml @@ -31,4 +31,4 @@ spec: serviceAccountName: prometheus-k8s serviceMonitorNamespaceSelector: {} serviceMonitorSelector: {} - version: v2.11.0 + version: v2.15.2