Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Jump to bottom

Update miekg/dns to v1.0.5 #229

Merged
merged 1 commit into from
May 4, 2018
Merged

Update miekg/dns to v1.0.5 #229

merged 1 commit into from
May 4, 2018
+31,231 −2,252

Conversation

grayluck
Copy link
Contributor

@grayluck grayluck commented May 4, 2018 •
edited
Loading

Due to this issue miekg/dns#642, dep miekg/dns is upgraded to v1.0.5 to prevent kubedns from panic when resolv.conf contains attempt. golang.org/x/net is upgraded to release-branch.go1.9.

Fixes #228
/assign @MrHohn

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 4, 2018
MrHohn
MrHohn reviewed May 4, 2018
View reviewed changes
Godeps/Godeps.json Outdated
@@ -1,7 +1,7 @@
{
"ImportPath": "k8s.io/dns",
"GoVersion": "go1.8",
Copy link
Member

Choose a reason for hiding this comment

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

Update to go1.9.3 to match what we have? Ref #193.

Copy link
Member

Choose a reason for hiding this comment

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

Actually, seems like we need to update the godep scripts

dns/build/dep.sh

Line 19 in d38b2c3

GOLANG_IMAGE="golang:1.8-alpine"
.

@MrHohn
Copy link
Member

MrHohn commented May 4, 2018

/ok-to-test

@k8s-ci-robot k8s-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label May 4, 2018
@grayluck grayluck closed this May 4, 2018
@k8s-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels May 4, 2018
@grayluck grayluck reopened this May 4, 2018
@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels May 4, 2018
@grayluck
Copy link
Contributor Author

grayluck commented May 4, 2018

Undone the changes and redo (re-done) for GOLANG_IMAGE="golang:1.9-alpine".

MrHohn
MrHohn approved these changes May 4, 2018
View reviewed changes
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.

Thanks!
/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 4, 2018
@MrHohn MrHohn merged commit 71f9bf5 into kubernetes:master May 4, 2018
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@MrHohn MrHohn MrHohn approved these changes

Assignees

@MrHohn MrHohn

Labels
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. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@grayluck @MrHohn @k8s-ci-robot