From 9e9b9060474cab1a7bd796cc3c76c6421dad3241 Mon Sep 17 00:00:00 2001 From: Marek Siarkowicz Date: Thu, 14 Mar 2019 09:35:00 +0100 Subject: [PATCH] Update gcp images with security patches [stackdriver addon] Bump prometheus-to-sd to v0.5.0 to pick up security fixes. [fluentd-gcp addon] Bump fluentd-gcp-scaler to v0.5.1 to pick up security fixes. [fluentd-gcp addon] Bump event-exporter to v0.2.4 to pick up security fixes. [fluentd-gcp addon] Bump prometheus-to-sd to v0.5.0 to pick up security fixes. [metatada-proxy addon] Bump prometheus-to-sd v0.5.0 to pick up security fixes. --- .../stackdriver/heapster-controller.yaml | 2 +- cluster/addons/fluentd-gcp/event-exporter.yaml | 12 ++++++------ cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml | 2 +- cluster/addons/fluentd-gcp/scaler-deployment.yaml | 4 ++-- .../addons/metadata-proxy/gce/metadata-proxy.yaml | 2 +- .../monitoring/custom_metrics_deployments.go | 2 +- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml index a18cbbbcc82c3..83c3a4881c034 100644 --- a/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml +++ b/cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml @@ -66,7 +66,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&cluster_location={{ cluster_location }} # BEGIN_PROMETHEUS_TO_SD - name: prom-to-sd - image: k8s.gcr.io/prometheus-to-sd:v0.3.1 + image: k8s.gcr.io/prometheus-to-sd:v0.5.0 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 600784b261215..918742e0124df 100644 --- a/cluster/addons/fluentd-gcp/event-exporter.yaml +++ b/cluster/addons/fluentd-gcp/event-exporter.yaml @@ -29,11 +29,11 @@ subjects: apiVersion: apps/v1 kind: Deployment metadata: - name: event-exporter-v0.2.3 + name: event-exporter-v0.2.4 namespace: kube-system labels: k8s-app: event-exporter - version: v0.2.3 + version: v0.2.4 kubernetes.io/cluster-service: "true" addonmanager.kubernetes.io/mode: Reconcile spec: @@ -41,23 +41,23 @@ spec: selector: matchLabels: k8s-app: event-exporter - version: v0.2.3 + version: v0.2.4 template: metadata: labels: k8s-app: event-exporter - version: v0.2.3 + version: v0.2.4 spec: serviceAccountName: event-exporter-sa containers: - name: event-exporter - image: k8s.gcr.io/event-exporter:v0.2.3 + image: k8s.gcr.io/event-exporter:v0.2.4 command: - /event-exporter - -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }} # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter - image: k8s.gcr.io/prometheus-to-sd:v0.3.1 + image: k8s.gcr.io/prometheus-to-sd:v0.5.0 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 b41fadafab59c..49c97ad35a031 100644 --- a/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml +++ b/cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml @@ -84,7 +84,7 @@ spec: fi; # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter - image: k8s.gcr.io/prometheus-to-sd:v0.3.1 + image: k8s.gcr.io/prometheus-to-sd:v0.5.0 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 a2448ddd1c0b6..e58386bc3d684 100644 --- a/cluster/addons/fluentd-gcp/scaler-deployment.yaml +++ b/cluster/addons/fluentd-gcp/scaler-deployment.yaml @@ -5,7 +5,7 @@ metadata: namespace: kube-system labels: k8s-app: fluentd-gcp-scaler - version: v0.5.0 + version: v0.5.1 addonmanager.kubernetes.io/mode: Reconcile spec: selector: @@ -19,7 +19,7 @@ spec: serviceAccountName: fluentd-gcp-scaler containers: - name: fluentd-gcp-scaler - image: k8s.gcr.io/fluentd-gcp-scaler:0.5 + image: k8s.gcr.io/fluentd-gcp-scaler:0.5.1 command: - /scaler.sh - --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }} diff --git a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml index 92f28103f8b05..230602ea44e1d 100644 --- a/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml +++ b/cluster/addons/metadata-proxy/gce/metadata-proxy.yaml @@ -61,7 +61,7 @@ spec: cpu: "30m" # BEGIN_PROMETHEUS_TO_SD - name: prometheus-to-sd-exporter - image: k8s.gcr.io/prometheus-to-sd:v0.3.1 + image: k8s.gcr.io/prometheus-to-sd:v0.5.0 # Request and limit resources to get guaranteed QoS. resources: requests: diff --git a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go index b83187c642d28..f30b3fef412f3 100644 --- a/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go +++ b/test/e2e/instrumentation/monitoring/custom_metrics_deployments.go @@ -221,7 +221,7 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32) }, { Name: "prometheus-to-sd", - Image: "k8s.gcr.io/prometheus-to-sd:v0.3.1", + Image: "k8s.gcr.io/prometheus-to-sd:v0.5.0", ImagePullPolicy: corev1.PullPolicy("Always"), Command: []string{"/monitor", fmt.Sprintf("--source=:http://localhost:%d", port), "--stackdriver-prefix=custom.googleapis.com", "--pod-id=$(POD_ID)", "--namespace-id=$(POD_NAMESPACE)"},