Update to support new version of addon-resizer

README.md

@@ -264,7 +264,7 @@ These are the available fields with their respective default values:
         nodeExporter: "v0.17.0",
         kubeStateMetrics: "v1.5.0",
         kubeRbacProxy: "v0.4.1",
-        addonResizer: "1.0",
+        addonResizer: "2.1",
         prometheusOperator: "v0.28.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: "quay.io/coreos/addon-resizer",
+        addonResizer: "gcr.io/google-containers/addon-resizer-amd64",
         nodeExporter: "quay.io/prometheus/node-exporter",
         prometheusOperator: "quay.io/coreos/prometheus-operator",
     },
@@ -402,9 +402,9 @@ 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 quay.io/coreos/addon-resizer:1.0
+docker pull gcr.io/google-containers/addon-resizer-amd64:2.1
-docker tag quay.io/coreos/addon-resizer:1.0 internal-registry.com/organization/addon-resizer:1.0
+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:1.0
+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

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: '1.0',
+      addonResizer: '2.1',
     },
 
     imageRepos+:: {
       kubeStateMetrics: 'quay.io/coreos/kube-state-metrics',
       kubeRbacProxy: 'quay.io/coreos/kube-rbac-proxy',
-      addonResizer: 'quay.io/coreos/addon-resizer',
+      addonResizer: 'gcr.io/google-containers/addon-resizer-amd64',
     },
   },
 
@@ -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,
-          '--threshold=5',
+          '--acceptance-offset=5',
           '--deployment=kube-state-metrics',
         ]) +
         container.withEnv([

jsonnetfile.lock.json

@@ -8,7 +8,7 @@
                     "subdir": "contrib/kube-prometheus/jsonnet/kube-prometheus"
                 }
             },
-            "version": "986d387aaa6c292c248fc9d31c8b564462bd619e"
+            "version": "7c4b660febf68b4b0930f761c7c0a992330d3935"
         },
         {
             "name": "ksonnet",
@@ -28,7 +28,7 @@
                     "subdir": ""
                 }
             },
-            "version": "ae5d0b27229765fc0670c48c09a95cb6da732de3"
+            "version": "a16ec1d098eb45e7cfb44d7e4b73ba7b766f0e0a"
         },
         {
             "name": "grafonnet",
@@ -78,7 +78,7 @@
                     "subdir": "Documentation/etcd-mixin"
                 }
             },
-            "version": "1fe6f109c87c4fa47775426a6a60c3b954ed5c33"
+            "version": "3546c4868cec93e1587471b42fd815684a7dd439"
         }
     ]
 }

manifests/kube-state-metrics-deployment.yaml

@@ -71,7 +71,7 @@ spec:
         - --extra-cpu=2m
         - --memory=150Mi
         - --extra-memory=30Mi
-        - --threshold=5
+        - --acceptance-offset=5
         - --deployment=kube-state-metrics
         env:
         - name: MY_POD_NAME
@@ -84,7 +84,7 @@ spec:
             fieldRef:
               apiVersion: v1
               fieldPath: metadata.namespace
-        image: quay.io/coreos/addon-resizer:1.0
+        image: gcr.io/google-containers/addon-resizer-amd64:2.1
         name: addon-resizer
         resources:
           limits:

manifests/prometheus-rules.yaml

@@ -691,11 +691,11 @@ spec:
         severity: warning
     - alert: KubeVersionMismatch
       annotations:
-        message: There are {{ $value }} different versions of Kubernetes components
+        message: There are {{ $value }} different semantic versions of Kubernetes
-          running.
+          components running.
         runbook_url: https://github.com/kubernetes-monitoring/kubernetes-mixin/tree/master/runbook.md#alert-name-kubeversionmismatch
       expr: |
-        count(count(kubernetes_build_info{job!="kube-dns"}) by (gitVersion)) > 1
+        count(count by (gitVersion) (label_replace(kubernetes_build_info{job!="kube-dns"},"gitVersion","$1","gitVersion","(v[0-9]*.[0-9]*.[0-9]*).*"))) > 1
       for: 1h
       labels:
         severity: warning