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

Merge pull request #42933 from timstclair/bump 

Automatic merge from submit-queue (batch tested with PRs 41794, 42349, 42755, 42901, 42933)

Bump cluster-proportional-autoscaler to 1.1.1-r2

```release-note
Patch CVE-2016-8859 in gcr.io/google-containers/cluster-proportional-autoscaler-amd64
```

/cc @ixdy
pull/6/head
Kubernetes Submit Queue 2017-03-10 22:02:22 -08:00 committed by GitHub
parent 81ba4741f3 5cda5966f3
commit b0ce93f9be
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/addons/dns-horizontal-autoscaler/dns-horizontal-autoscaler.yaml
View File

@ -31,7 +31,7 @@ spec:
spec: spec:
containers: containers:
- name: autoscaler - name: autoscaler
image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1 image: gcr.io/google_containers/cluster-proportional-autoscaler-amd64:1.1.1-r2
resources: resources:
requests: requests:
cpu: "20m" cpu: "20m"