Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Automated cherry pick of #75362: Update gcp images with security patches #75883

Merged
merged 1 commit into from
Apr 5, 2019
Merged

Automated cherry pick of #75362: Update gcp images with security patches #75883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion cluster/addons/cluster-monitoring/stackdriver/heapster-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
# 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
Expand Down
10 changes: 5 additions & 5 deletions cluster/addons/fluentd-gcp/event-exporter.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,11 @@ subjects:
apiVersion: apps/v1beta1
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:
Expand All @@ -42,18 +42,18 @@ spec:
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
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/fluentd-gcp/fluentd-gcp-ds.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,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
Expand Down
4 changes: 2 additions & 2 deletions cluster/addons/fluentd-gcp/scaler-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion cluster/addons/metadata-proxy/gce/metadata-proxy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,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:
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/instrumentation/monitoring/custom_metrics_deployments.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,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)"},
Expand Down