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 #41771 #42005

Merged
merged 1 commit into from Mar 29, 2017
Merged

Automated cherry pick of #41771 #42005

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 build/build-image/cross/Dockerfile
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@
# This file creates a standard build environment for building cross
# platform go binary for the architecture kubernetes cares about.

FROM golang:1.7.4
FROM golang:1.7.5

ENV GOARM 6
ENV KUBE_DYNAMIC_CROSSPLATFORMS \
Expand Down
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
View file
Open in desktop
@@ -1 +1 @@
v1.7.4-0
v1.7.5-k8s1.5-0
Copy link
Member

Choose a reason for hiding this comment

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

I guess we can modify this tag to include the k8s version in it. maybe v1.7.5-k8s1.5-0?

I should double-check that there aren't any other changes we should cherrypick if we do that.

Copy link
Member Author

Choose a reason for hiding this comment

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

That would make sense to me!

Copy link
Member

Choose a reason for hiding this comment

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

can you make that change here? I'll make sure everything else looks OK and then can push a new image.

Copy link
Member Author

Choose a reason for hiding this comment

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

Done!