Merge pull request #67691 from loburm/security_fixes

Automatic merge from submit-queue (batch tested with PRs 67691, 68147). If you want to cherry-pick this change to another branch, please follow the instructions here: https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md.

Bump versions of components with latest security patches.

**What this PR does / why we need it**:
Upgrade versions of monitoring components used on GCP, to include latest security patches.

**Release note**:
```release-note
[fluentd-gcp-scaler addon] Bump fluentd-gcp-scaler to 0.4 to pick up security fixes.
[prometheus-to-sd addon] Bump prometheus-to-sd to 0.3.1 to pick up security fixes, bug fixes and new features.
[event-exporter addon] Bump event-exporter to 0.2.3 to pick up security fixes.
```
This commit is contained in:
Kubernetes Submit Queue 2018-09-05 09:49:31 -07:00 committed by GitHub
commit e2d6362c09
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 11 additions and 11 deletions

View File

@ -63,7 +63,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 }} - --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 # BEGIN_PROMETHEUS_TO_SD
- name: prom-to-sd - name: prom-to-sd
image: k8s.gcr.io/prometheus-to-sd:v0.2.4 image: k8s.gcr.io/prometheus-to-sd:v0.3.1
command: command:
- /monitor - /monitor
- --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count - --source=heapster:http://localhost:8082?whitelisted=stackdriver_requests_count,stackdriver_timeseries_count

View File

@ -29,11 +29,11 @@ subjects:
apiVersion: apps/v1beta1 apiVersion: apps/v1beta1
kind: Deployment kind: Deployment
metadata: metadata:
name: event-exporter-v0.2.2 name: event-exporter-v0.2.3
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.2.2 version: v0.2.3
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
@ -42,18 +42,18 @@ spec:
metadata: metadata:
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.2.2 version: v0.2.3
spec: spec:
serviceAccountName: event-exporter-sa serviceAccountName: event-exporter-sa
containers: containers:
- name: event-exporter - name: event-exporter
image: k8s.gcr.io/event-exporter:v0.2.2 image: k8s.gcr.io/event-exporter:v0.2.3
command: command:
- /event-exporter - /event-exporter
- -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }} - -sink-opts=-stackdriver-resource-model={{ exporter_sd_resource_model }}
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.4 image: k8s.gcr.io/prometheus-to-sd:v0.3.1
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

View File

@ -80,7 +80,7 @@ spec:
fi; fi;
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.4 image: k8s.gcr.io/prometheus-to-sd:v0.3.1
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

View File

@ -5,7 +5,7 @@ metadata:
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: fluentd-gcp-scaler k8s-app: fluentd-gcp-scaler
version: v0.3.0 version: v0.4.0
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
selector: selector:
@ -19,7 +19,7 @@ spec:
serviceAccountName: fluentd-gcp-scaler serviceAccountName: fluentd-gcp-scaler
containers: containers:
- name: fluentd-gcp-scaler - name: fluentd-gcp-scaler
image: k8s.gcr.io/fluentd-gcp-scaler:0.3 image: k8s.gcr.io/fluentd-gcp-scaler:0.4
command: command:
- /scaler.sh - /scaler.sh
- --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }} - --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }}

View File

@ -57,7 +57,7 @@ spec:
cpu: "30m" cpu: "30m"
# BEGIN_PROMETHEUS_TO_SD # BEGIN_PROMETHEUS_TO_SD
- name: prometheus-to-sd-exporter - name: prometheus-to-sd-exporter
image: k8s.gcr.io/prometheus-to-sd:v0.2.4 image: k8s.gcr.io/prometheus-to-sd:v0.3.1
# Request and limit resources to get guaranteed QoS. # Request and limit resources to get guaranteed QoS.
resources: resources:
requests: requests:

View File

@ -211,7 +211,7 @@ func prometheusExporterPodSpec(metricName string, metricValue int64, port int32)
}, },
{ {
Name: "prometheus-to-sd", Name: "prometheus-to-sd",
Image: "k8s.gcr.io/prometheus-to-sd:v0.2.3", Image: "k8s.gcr.io/prometheus-to-sd:v0.3.1",
ImagePullPolicy: corev1.PullPolicy("Always"), ImagePullPolicy: corev1.PullPolicy("Always"),
Command: []string{"/monitor", fmt.Sprintf("--source=:http://localhost:%d", port), Command: []string{"/monitor", fmt.Sprintf("--source=:http://localhost:%d", port),
"--stackdriver-prefix=custom.googleapis.com", "--pod-id=$(POD_ID)", "--namespace-id=$(POD_NAMESPACE)"}, "--stackdriver-prefix=custom.googleapis.com", "--pod-id=$(POD_ID)", "--namespace-id=$(POD_NAMESPACE)"},