From 5ed3fb06c9a7674ed3c4d6f41740ca376918eb9c Mon Sep 17 00:00:00 2001
From: goll <adrian.goll@gmail.com>
Date: Wed, 13 Mar 2019 20:21:36 +0100
Subject: [PATCH] Use suggested addon-resizer 1.8.4
---
README.md | 20 +++++++++----------
.../alertmanager/alertmanager.libsonnet | 2 +-
.../kube-prometheus/alerts/general.libsonnet | 4 ++--
.../kube-state-metrics.libsonnet | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/README.md b/README.md
index 9a78a2ef..79e7f929 100644
--- a/README.md
+++ b/README.md
@@ -260,12 +260,12 @@ These are the available fields with their respective default values:
namespace: "default",
versions+:: {
- alertmanager: "v0.16.0",
+ alertmanager: "v0.16.1",
nodeExporter: "v0.17.0",
kubeStateMetrics: "v1.5.0",
kubeRbacProxy: "v0.4.1",
- addonResizer: "2.1",
- prometheusOperator: "v0.28.0",
+ addonResizer: "1.8.4",
+ prometheusOperator: "v0.29.0",
prometheus: "v2.5.0",
},
@@ -274,7 +274,7 @@ These are the available fields with their respective default values:
alertmanager: "quay.io/prometheus/alertmanager",
kubeStateMetrics: "quay.io/coreos/kube-state-metrics",
kubeRbacProxy: "quay.io/coreos/kube-rbac-proxy",
- addonResizer: "gcr.io/google-containers/addon-resizer-amd64",
+ addonResizer: "k8s.gcr.io/addon-resizer",
nodeExporter: "quay.io/prometheus/node-exporter",
prometheusOperator: "quay.io/coreos/prometheus-operator",
},
@@ -402,12 +402,12 @@ To produce the `docker pull/tag/push` commands that will synchronize upstream im
```shell
$ jsonnet -J vendor -S --tla-str repository=internal-registry.com/organization sync-to-internal-registry.jsonnet
-docker pull gcr.io/google-containers/addon-resizer-amd64:2.1
-docker tag gcr.io/google-containers/addon-resizer-amd64:2.1 internal-registry.com/organization/addon-resizer:2.1
-docker push internal-registry.com/organization/addon-resizer:2.1
-docker pull quay.io/prometheus/alertmanager:v0.15.3
-docker tag quay.io/prometheus/alertmanager:v0.15.3 internal-registry.com/organization/alertmanager:v0.15.3
-docker push internal-registry.com/organization/alertmanager:v0.15.3
+docker pull k8s.gcr.io/addon-resizer:1.8.4
+docker tag k8s.gcr.io/addon-resizer:1.8.4 internal-registry.com/organization/addon-resizer:1.8.4
+docker push internal-registry.com/organization/addon-resizer:1.8.4
+docker pull quay.io/prometheus/alertmanager:v0.16.1
+docker tag quay.io/prometheus/alertmanager:v0.16.1 internal-registry.com/organization/alertmanager:v0.16.1
+docker push internal-registry.com/organization/alertmanager:v0.16.1
...
```
diff --git a/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet b/jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
index 02909525..6d5525e1 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.3/k.libsonnet';
namespace: 'default',
versions+:: {
- alertmanager: 'v0.16.0',
+ alertmanager: 'v0.16.1',
},
imageRepos+:: {
diff --git a/jsonnet/kube-prometheus/alerts/general.libsonnet b/jsonnet/kube-prometheus/alerts/general.libsonnet
index 8802097e..8705389f 100644
--- a/jsonnet/kube-prometheus/alerts/general.libsonnet
+++ b/jsonnet/kube-prometheus/alerts/general.libsonnet
@@ -16,14 +16,14 @@
},
},
{
- alert: 'Watchdog',
+ alert: 'DeadMansSwitch',
annotations: {
message: |||
This is an alert meant to ensure that the entire alerting pipeline is functional.
This alert is always firing, therefore it should always be firing in Alertmanager
and always fire against a receiver. There are integrations with various notification
mechanisms that send a notification when this alert is not firing. For example the
- "DeadMansSnitch" integration in PagerDuty.
+ "DeadMansSwitch" integration in PagerDuty.
|||,
},
expr: 'vector(1)',
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 0f59af4d..5172fb94 100644
--- a/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
+++ b/jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
@@ -18,13 +18,13 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
versions+:: {
kubeStateMetrics: 'v1.5.0',
kubeRbacProxy: 'v0.4.1',
- addonResizer: '2.1',
+ addonResizer: '1.8.4',
},
imageRepos+:: {
kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy',
- addonResizer: 'gcr.io/google-containers/addon-resizer-amd64',
+ addonResizer: 'k8s.gcr.io/addon-resizer',
},
},
@@ -175,7 +175,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
'--extra-cpu=' + $._config.kubeStateMetrics.cpuPerNode,
'--memory=' + $._config.kubeStateMetrics.baseMemory,
'--extra-memory=' + $._config.kubeStateMetrics.memoryPerNode,
- '--acceptance-offset=5',
+ '--threshold=5',
'--deployment=kube-state-metrics',
]) +
container.withEnv([
--
GitLab