Skip to content

Update dnsmasq image to use go1.7.6 and alpine:3.6 #108

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.

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

Merged
merged 1 commit into from
Jun 14, 2017

Conversation

ixdy
Copy link
Member

@ixdy ixdy commented Jun 13, 2017

Updated golang dependency includes the fix for golang/go#20040.
Updated alpine dependency includes fixes for CVE-2016-9841 and CVE-2016-9843.

Note that we should probably build a new dnsmasq image before building the rest, since dnsmasq-nanny depends on it.

@MrHohn @bowei

x-ref kubernetes/kubernetes#47386

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jun 13, 2017
Copy link
Member

@MrHohn MrHohn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@@ -13,19 +13,19 @@
# limitations under the License.

VERSION ?= $(shell git describe --tags --always --dirty)
REGISTRY ?= gcr.io/google_containers
REGISTRY ?= gcr.io/google-containers
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So we are consolidating images to google-containers in future? Just notice that cluster-proportional-autoscaler is still using google_containers.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yeah, they're basically equivalent as far as docker is concerned, but various utilities prefer the real project name (google-containers) instead of the docker hack (google_containers), so I've been slowly updating references as I come across them.

one of these days I might just do a large fixit.

@ixdy ixdy force-pushed the update-dnsmasq branch from 259b03e to 51dd4b3 Compare June 13, 2017 21:40
@ixdy
Copy link
Member Author

ixdy commented Jun 13, 2017

hm, looking into the arm build failure.

Also, update arm to arm-linux-gnueabihf, and pull base images always
@ixdy ixdy force-pushed the update-dnsmasq branch from 51dd4b3 to 9a01cf5 Compare June 13, 2017 22:01
@ixdy
Copy link
Member Author

ixdy commented Jun 13, 2017

OK, fixed the build by changing arm from arm-linux-gnueabi to arm-linux-gnueabihf. I hope this is OK? @luxas

@MrHohn
Copy link
Member

MrHohn commented Jun 13, 2017

Will go ahead and merge it tonight if no more comments :)

@cmluciano
Copy link

I had a similar PR that bumped to go 1.8 to match kubernetes/kubernetes here #105. Should I close this in favor of sticking with 1.7.X ?

@MrHohn
Copy link
Member

MrHohn commented Jun 14, 2017

@cmluciano I think this PR is more about fixing CVEs in kube-dns images and that needs to get into 1.7 release. Let's keep #105 as we are not sticking with 1.7.x forever.

@MrHohn MrHohn merged commit 14e8971 into kubernetes:master Jun 14, 2017
@bowei
Copy link
Member

bowei commented Jun 14, 2017

Do we need to push a new tag and release and update the reference in the main repo?

@ixdy
Copy link
Member Author

ixdy commented Jun 14, 2017

@bowei Yeah, we should update the dnsmasq image and then ideally the rest of the k8s-dns images, too.

k8s-github-robot pushed a commit to kubernetes/kubernetes that referenced this pull request Jun 29, 2017
Automatic merge from submit-queue

Refresh cluster-proportional-autoscaler, fluentd-gcp, kube-addon-manager, and kube-dns addons

**What this PR does / why we need it**: refreshes a number of addons with new base images:
* gcr.io/google-containers/cluster-proportional-autoscaler-amd64:1.1.1-r3 (rebuilt at 1.1.1)
* gcr.io/google-containers/fluentd-gcp:2.0.7 (kubernetes-retired/contrib#2633, kubernetes-retired/contrib#2640)
* gcr.io/google-containers/kube-addon-manager:v6.4-beta.2 (cherry-pick from #47389)
* gcr.io/google-containers/k8s-dns-*:1.14.4 (kubernetes/dns#107, kubernetes/dns#108, kubernetes/dns#114, kubernetes/dns#115)

These include upstream fixes to base images with fixes for the following CVEs:
* CVE-2016-9841
* CVE-2016-9843
* CVE-2017-2616
* CVE-2017-6512

Note: I did **not** update the fluentd-gcp version in `cluster/saltbase/salt/fluentd-gcp/fluentd-gcp.yaml`, which is currently 2.0.2. While there should be no functional changes 2.0.5 -> 2.0.7, I don't know about 2.0.2 -> 2.0.7. If we think this is safe, I can update that one too; otherwise, we may need to build a 2.0.2-r2 image.

**Release note**:

```release-note
Update cluster-proportional-autoscaler, fluentd-gcp, and kube-addon-manager, and kube-dns addons with refreshed base images containing fixes for CVE-2016-9841, CVE-2016-9843, CVE-2017-2616, and CVE-2017-6512.
```
/release-note
/assign @timstclair @enisoc 
/cc @MrHohn @crassirostris
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants