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.

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

Bump golang versions to 1.7.5 #41771

Merged
merged 1 commit into from
Feb 23, 2017
Merged

Conversation

cblecker
Copy link
Member

What this PR does / why we need it: While #41636 might not make it in until 1.7, this would bump current golang versions from 1.7.4 to 1.7.5 to integrate the fixes from that patch version. This would include, among other things, a fix to ensure cross-built binaries for darwin don't have certificate validation errors (golang/go#18688)

Which issue this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close that issue when PR gets merged): none

Special notes for your reviewer:

Release note:

Upgrade golang versions to 1.7.5

@k8s-ci-robot
Copy link
Contributor

Hi @cblecker. Thanks for your PR.

I'm waiting for a kubernetes member to verify that this patch is reasonable to test. If it is, they should reply with @k8s-bot ok to test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

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

This change is Reviewable

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 21, 2017
Copy link
Member

@ixdy ixdy left a comment

Choose a reason for hiding this comment

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

LGTM. building cross image now, will push and then trigger tests.

@@ -18,7 +18,7 @@
# [GOLANG_VERSION=1.7.4] [REGISTRY=gcr.io/google-containers] [TAG=test] make (build|push)
Copy link
Member

Choose a reason for hiding this comment

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

not essential, but maybe update this comment too for consistency?

Copy link
Member Author

Choose a reason for hiding this comment

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

Fixed!

@ixdy
Copy link
Member

ixdy commented Feb 21, 2017

gcr.io/google_containers/kube-cross:v1.7.5-1 pushed.
@k8s-bot ok to test
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Feb 21, 2017
@ixdy
Copy link
Member

ixdy commented Feb 21, 2017

/approve

@ixdy
Copy link
Member

ixdy commented Feb 21, 2017

@k8s-bot test this

@mikedanese
Copy link
Member

/approve

@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

The following people have approved this PR: cblecker, ixdy, mikedanese

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 21, 2017
@ixdy
Copy link
Member

ixdy commented Feb 21, 2017

@k8s-bot cross build this

@cblecker
Copy link
Member Author

These don't look related to this PR, but it seems the queue is currently blocked.

@cblecker
Copy link
Member Author

Looks like the queue might be running again, so let's give this a shot:
@k8s-bot cvm gke e2e test this
@k8s-bot gci gke e2e test this
@k8s-bot non-cri e2e test this
@k8s-bot cvm gce e2e test this

@cblecker
Copy link
Member Author

@k8s-bot non-cri e2e test this

@cblecker
Copy link
Member Author

@ixdy Question: Is this worth cherrypicking back to release-1.5, as 1.5 is using go1.7.4 as well?

@ixdy
Copy link
Member

ixdy commented Feb 22, 2017

@cblecker yeah, seems like a good idea, since 1.6 won't be released for a while yet. cc @mwielgus

@cblecker
Copy link
Member Author

@saad-ali FYI :)

@cblecker
Copy link
Member Author

Also, maybe a dumb question as I'm relatively new around these parts..
I know release-1.6 recently opened up ahead of Monday's code freeze.. does this also need a cherrypick against that? Or will it be batched in before Monday?

@ixdy
Copy link
Member

ixdy commented Feb 22, 2017

There will be regular fast-forwards of the release-1.6 branch from master.
Starting Monday, if this PR hasn't yet merged, we'll need to add the 1.6 milestone tag.

@cblecker
Copy link
Member Author

Got it! Thank you!

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 41812, 41665, 40007, 41281, 41771)

@k8s-github-robot k8s-github-robot merged commit a91cf1e into kubernetes:master Feb 23, 2017
@cblecker cblecker deleted the go-1.7.5 branch February 23, 2017 08:20
@cblecker cblecker restored the go-1.7.5 branch February 23, 2017 08:20
@cblecker cblecker deleted the go-1.7.5 branch February 23, 2017 17:53
@cblecker
Copy link
Member Author

@ixdy @saad-ali: As this is now in master, is there anything else I should do to help it get picked into release-1.5? (I haven't done this before, so thanks for your patience)

@ixdy
Copy link
Member

ixdy commented Feb 23, 2017

@ixdy ixdy added this to the v1.5 milestone Feb 23, 2017
@cblecker
Copy link
Member Author

Awesome, thank you! I've opened #42005 using that script.

Note: During conflict resolution, I removed a couple of the changes that were in this PR as there are parts of 1.5 that are still on go 1.6, and that is a much bigger jump. The cross-build image though was 1.7.4, so that's the big one.

k8s-github-robot pushed a commit that referenced this pull request Mar 29, 2017
…71-upstream-release-1.5

Automatic merge from submit-queue

Automated cherry pick of #41771

Cherry pick of #41771 on release-1.5.

#41771: Bump golang versions to 1.7.5
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.5" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

justinsb added a commit to justinsb/kops that referenced this pull request Mar 30, 2017
Kubernetes did so in kubernetes/kubernetes#41771

We're also starting to see failures with pulling the 1.7.4 image
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants