easylinux/kube-prometheus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use suggested addon-resizer 1.8.4

Browse Source
This commit is contained in:
goll
2019-03-13 20:21:36 +01:00
parent 3b52a05d58
commit 5ed3fb06c9
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
README.md
View File

@@ -260,12 +260,12 @@ These are the available fields with their respective default values:
namespace: "default", namespace: "default",
versions+:: { versions+:: {
alertmanager: "v0.16.0", alertmanager: "v0.16.1",
nodeExporter: "v0.17.0", nodeExporter: "v0.17.0",
kubeStateMetrics: "v1.5.0", kubeStateMetrics: "v1.5.0",
kubeRbacProxy: "v0.4.1", kubeRbacProxy: "v0.4.1",
addonResizer: "2.1", addonResizer: "1.8.4",
prometheusOperator: "v0.28.0", prometheusOperator: "v0.29.0",
prometheus: "v2.5.0", prometheus: "v2.5.0",
}, },
@@ -274,7 +274,7 @@ These are the available fields with their respective default values:
alertmanager: "quay.io/prometheus/alertmanager", alertmanager: "quay.io/prometheus/alertmanager",
kubeStateMetrics: "quay.io/coreos/kube-state-metrics", kubeStateMetrics: "quay.io/coreos/kube-state-metrics",
kubeRbacProxy: "quay.io/coreos/kube-rbac-proxy", 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", nodeExporter: "quay.io/prometheus/node-exporter",
prometheusOperator: "quay.io/coreos/prometheus-operator", prometheusOperator: "quay.io/coreos/prometheus-operator",
}, },
@@ -402,12 +402,12 @@ To produce the `docker pull/tag/push` commands that will synchronize upstream im
```shell ```shell
$ jsonnet -J vendor -S --tla-str repository=internal-registry.com/organization sync-to-internal-registry.jsonnet $ 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 pull k8s.gcr.io/addon-resizer:1.8.4
docker tag gcr.io/google-containers/addon-resizer-amd64:2.1 internal-registry.com/organization/addon-resizer:2.1 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:2.1 docker push internal-registry.com/organization/addon-resizer:1.8.4
docker pull quay.io/prometheus/alertmanager:v0.15.3 docker pull quay.io/prometheus/alertmanager:v0.16.1
docker tag quay.io/prometheus/alertmanager:v0.15.3 internal-registry.com/organization/alertmanager:v0.15.3 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.15.3 docker push internal-registry.com/organization/alertmanager:v0.16.1
... ...
``` ```

2
jsonnet/kube-prometheus/alertmanager/alertmanager.libsonnet
View File

@@ -5,7 +5,7 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
namespace: 'default', namespace: 'default',
versions+:: { versions+:: {
alertmanager: 'v0.16.0', alertmanager: 'v0.16.1',
}, },
imageRepos+:: { imageRepos+:: {

4
jsonnet/kube-prometheus/alerts/general.libsonnet
View File

@@ -16,14 +16,14 @@
}, },
}, },
{ {
alert: 'Watchdog', alert: 'DeadMansSwitch',
annotations: { annotations: {
message: ||| message: |||
This is an alert meant to ensure that the entire alerting pipeline is functional. 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 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 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 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)', expr: 'vector(1)',

6
jsonnet/kube-prometheus/kube-state-metrics/kube-state-metrics.libsonnet
View File

@@ -18,13 +18,13 @@ local k = import 'ksonnet/ksonnet.beta.3/k.libsonnet';
versions+:: { versions+:: {
kubeStateMetrics: 'v1.5.0', kubeStateMetrics: 'v1.5.0',
kubeRbacProxy: 'v0.4.1', kubeRbacProxy: 'v0.4.1',
addonResizer: '2.1', addonResizer: '1.8.4',
}, },
imageRepos+:: { imageRepos+:: {
kubeStateMetrics: 'quay.io/coreos/kube-state-metrics', kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy', 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, '--extra-cpu=' + $._config.kubeStateMetrics.cpuPerNode,
'--memory=' + $._config.kubeStateMetrics.baseMemory, '--memory=' + $._config.kubeStateMetrics.baseMemory,
'--extra-memory=' + $._config.kubeStateMetrics.memoryPerNode, '--extra-memory=' + $._config.kubeStateMetrics.memoryPerNode,
'--acceptance-offset=5', '--threshold=5',
'--deployment=kube-state-metrics', '--deployment=kube-state-metrics',
]) + ]) +
container.withEnv([ container.withEnv([