-
Notifications
You must be signed in to change notification settings - Fork 8.2k
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
[Cherry Pick] - Add configuration to disable external name service feature (#7314) #7321
[Cherry Pick] - Add configuration to disable external name service feature (#7314) #7321
Conversation
go.sum
Outdated
@@ -804,6 +811,27 @@ golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7w | |||
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd h1:5CtCZbICpIOFdgO940moixOPjc0178IU44m4EjOO5IY= | |||
golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= | |||
<<<<<<< HEAD |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Conflicting?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah, idiot me...
just tidyied the go.sum here again :D
…s#7314) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com>
e5f55cf
to
3db4a47
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
/lgtm
@rikatz need trigger the GitHub actions |
There's something strange happening here. It says there's a timeout waiting for e2e pod to run in GH actions, but the same branch runs correctly here in my machine with k8s v1.17. Will do some further investigation |
/lgtm |
020711f
to
95d0d9b
Compare
95d0d9b
to
73a6c1f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
CI is green.
/lgtm
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: rikatz, strongjz, tao12345666333 The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
…ature (kubernetes#7314) (kubernetes#7321) * Add configuration to disable external name service feature (kubernetes#7314) Signed-off-by: Ricardo Pchevuzinske Katz <ricardo.katz@gmail.com> * Fix CI files
Signed-off-by: Ricardo Pchevuzinske Katz ricardo.katz@gmail.com
Cherry-pick of #7314 to branch v0.X
/assign @tao12345666333 @strongjz
/cc @tao12345666333 @strongjz
/kind cleanup feature