github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/564/head
Marek Siarkowicz 2019-03-14 09:35:00 +01:00 committed by Karol Wychowaniec
parent a9f35a67c8
commit 93388c9fc2
6 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View File

@ -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 }} - --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.3.1 image: k8s.gcr.io/prometheus-to-sd:v0.5.0
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

12
cluster/addons/fluentd-gcp/event-exporter.yaml
View File

@ -29,11 +29,11 @@ subjects:
apiVersion: apps/v1 apiVersion: apps/v1
kind: Deployment kind: Deployment
metadata: metadata:
name: event-exporter-v0.2.3 name: event-exporter-v0.2.4
namespace: kube-system namespace: kube-system
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.2.3 version: v0.2.4
kubernetes.io/cluster-service: "true" kubernetes.io/cluster-service: "true"
addonmanager.kubernetes.io/mode: Reconcile addonmanager.kubernetes.io/mode: Reconcile
spec: spec:
@ -41,23 +41,23 @@ spec:
selector: selector:
matchLabels: matchLabels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.2.3 version: v0.2.4
template: template:
metadata: metadata:
labels: labels:
k8s-app: event-exporter k8s-app: event-exporter
version: v0.2.3 version: v0.2.4
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.3 image: k8s.gcr.io/event-exporter:v0.2.4
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.3.1 image: k8s.gcr.io/prometheus-to-sd:v0.5.0
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

2
cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View File

@ -84,7 +84,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.3.1 image: k8s.gcr.io/prometheus-to-sd:v0.5.0
command: command:
- /monitor - /monitor
- --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons - --stackdriver-prefix={{ prometheus_to_sd_prefix }}/addons

4
cluster/addons/fluentd-gcp/scaler-deployment.yaml
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.5.0 version: v0.5.1
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.5 image: k8s.gcr.io/fluentd-gcp-scaler:0.5.1
command: command:
- /scaler.sh - /scaler.sh
- --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }} - --ds-name=fluentd-gcp-{{ fluentd_gcp_yaml_version }}

2
cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View File

@ -61,7 +61,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.3.1 image: k8s.gcr.io/prometheus-to-sd:v0.5.0
# Request and limit resources to get guaranteed QoS. # Request and limit resources to get guaranteed QoS.
resources: resources:
requests: requests:

2
test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
View File

@ -221,7 +221,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.3.1", Image: "k8s.gcr.io/prometheus-to-sd:v0.5.0",
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)"},