From a88ddac1e47e0bc4b43bfa1b0df2f19aea4455f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20K=C5=82obuszewski?= <danielmk@google.com>
Date: Tue, 13 Feb 2018 15:33:57 +0100
Subject: [PATCH] use prometheus-to-sd 0.2.4 and fluentd-gcp-image 2.0.16

---
 .../stackdriver/heapster-controller.yaml               |  2 +-
 cluster/addons/fluentd-gcp/event-exporter.yaml         |  2 +-
 cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml         | 10 +++++-----
 cluster/addons/fluentd-gcp/scaler-deployment.yaml      |  2 +-
 cluster/addons/metadata-proxy/gce/metadata-proxy.yaml  |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
index f1564204300..19ba7d35f56 100644
--- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
+++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
@@ -61,7 +61,7 @@ spec:
             - --sink=stackdriver:?cluster_name={{ cluster_name }}&use_old_resources={{ use_old_resources }}&use_new_resources={{ use_new_resources }}&min_interval_sec=100&batch_export_timeout_sec=110
         # BEGIN_PROMETHEUS_TO_SD
         - name: prom-to-sd
-          image: k8s.gcr.io/prometheus-to-sd:v0.2.2
+          image: k8s.gcr.io/prometheus-to-sd:v0.2.4
           command:
             - /monitor
             - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count
diff --git a/cluster/addons/fluentd-gcp/event-exporter.yaml b/cluster/addons/fluentd-gcp/event-exporter.yaml
index 6321b3844f3..9e93dbf3fef 100644
--- a/cluster/addons/fluentd-gcp/event-exporter.yaml
+++ b/cluster/addons/fluentd-gcp/event-exporter.yaml
@@ -52,7 +52,7 @@ spec:
         - '/event-exporter'
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.4
         command:
           - /monitor
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
diff --git a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
index 588706e8a53..bbc33921677 100644
--- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
+++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
@@ -1,13 +1,13 @@
 apiVersion: extensions/v1beta1
 kind: DaemonSet
 metadata:
-  name: fluentd-gcp-v2.0.14
+  name: fluentd-gcp-v2.0.16
   namespace: kube-system
   labels:
     k8s-app: fluentd-gcp
     kubernetes.io/cluster-service: "true"
     addonmanager.kubernetes.io/mode: Reconcile
-    version: v2.0.14
+    version: v2.0.16
 spec:
   updateStrategy:
     type: RollingUpdate
@@ -16,7 +16,7 @@ spec:
       labels:
         k8s-app: fluentd-gcp
         kubernetes.io/cluster-service: "true"
-        version: v2.0.14
+        version: v2.0.16
       # This annotation ensures that fluentd does not get evicted if the node
       # supports critical pod annotation based priority scheme.
       # Note that this does not guarantee admission on the nodes (#40573).
@@ -28,7 +28,7 @@ spec:
       dnsPolicy: Default
       containers:
       - name: fluentd-gcp
-        image: k8s.gcr.io/fluentd-gcp:2.0.14
+        image: k8s.gcr.io/fluentd-gcp:2.0.16
         env:
         - name: FLUENTD_ARGS
           value: --no-supervisor -q
@@ -77,7 +77,7 @@ spec:
               fi;
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.4
         command:
           - /monitor
           - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons
diff --git a/cluster/addons/fluentd-gcp/scaler-deployment.yaml b/cluster/addons/fluentd-gcp/scaler-deployment.yaml
index 2ed6359d235..1176454a37e 100644
--- a/cluster/addons/fluentd-gcp/scaler-deployment.yaml
+++ b/cluster/addons/fluentd-gcp/scaler-deployment.yaml
@@ -22,7 +22,7 @@ spec:
         image: gcr.io/google-containers/fluentd-gcp-scaler:0.1
         command:
           - /scaler.sh
-          - --ds-name=fluentd-gcp-v2.0.14
+          - --ds-name=fluentd-gcp-v2.0.16
           - --scaling-policy=fluentd-gcp-scaling-policy
         env:
         # Defaults, used if no overrides are found in fluentd-gcp-scaling-policy
diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
index 99f7097784d..7f9948ddbc4 100644
--- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
+++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
@@ -52,7 +52,7 @@ spec:
             cpu: "30m"
       # BEGIN_PROMETHEUS_TO_SD
       - name: prometheus-to-sd-exporter
-        image: k8s.gcr.io/prometheus-to-sd:v0.2.2
+        image: k8s.gcr.io/prometheus-to-sd:v0.2.4
         # Request and limit resources to get guaranteed QoS.
         resources:
           requests: