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

Remove vendored kube2sky, Add kube-dns as cluster addon #738

Merged
merged 2 commits into from
Oct 26, 2016

Conversation

r2d4
Copy link
Contributor

@r2d4 r2d4 commented Oct 21, 2016

Removes the vendored in kube2sky built into the minikube binary and
replaces the dns solution with kube-dns cluster addon. This will allow
users to swap out DNS implementations by simply turning off the
kube-dns addon.

TBD: How to handle older localkube versions?

These versions will try to run their own DNS unless --enable-dns=false is passed into localkube. This will conflict with the addon's clusterIP.

Proposed fix in this PR
I deprecated the flag in newer versions of localkube, and made minikube always pass in enable-dns=false. This will be a no-op in new versions of localkube and disable DNS in favor of the cluster addon in older versions. We won't need to rebuild any old versions of localkube, but are stuck with a deprecated flag.

PTAL a look at the first commit which contains the changes. The second is only removing the unused vendor packages.

Fixes #55

@codecov-io
Copy link

codecov-io commented Oct 21, 2016

Current coverage is 33.95% (diff: 100%)

Merging #738 into master will increase coverage by 2.66%

@@             master       #738   diff @@
==========================================
  Files            43         42     -1   
  Lines          1975       1820   -155   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits            618        618          
+ Misses         1228       1073   -155   
  Partials        129        129          

Powered by Codecov. Last update bdfaf1e...91b1155

@@ -51,7 +50,7 @@ func NewLocalkubeServer() *localkube.LocalkubeServer {
// AddFlags adds flags for a specific LocalkubeServer
func AddFlags(s *localkube.LocalkubeServer) {
flag.BoolVar(&s.Containerized, "containerized", s.Containerized, "If kubelet should run in containerized mode")
flag.BoolVar(&s.EnableDNS, "enable-dns", s.EnableDNS, "If dns should be enabled")
flag.BoolVar(&s.EnableDNS, "enable-dns", s.EnableDNS, "DEPRECATED: Please run kube-dns as an cluster addon")
Copy link
Contributor

Choose a reason for hiding this comment

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

Should we just remove this flag? It seems as though it does nothing now. Just a suggestion though, either way seems fine.

EDIT: Talked about this offline, flag is there for compatibility with previous versions of localkube

@dlorenc
Copy link
Contributor

dlorenc commented Oct 21, 2016

@minikube-bot test this please

@r2d4 r2d4 mentioned this pull request Oct 24, 2016
@dlorenc
Copy link
Contributor

dlorenc commented Oct 24, 2016

Would you mind rebasing onto master and rerunning tests?

@r2d4
Copy link
Contributor Author

r2d4 commented Oct 24, 2016

Rebased, test rerunning now

Removes the vendored in kube2sky built into the minikube binary and
replaces the dns solution with kube-dns cluster addon.  This will allow
users to swap out DNS implementations by simply turning off the
kube-dns addon.
These were referenced by kube2sky and our dns implementation
Copy link
Contributor

@dlorenc dlorenc left a comment

Choose a reason for hiding this comment

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

Thanks for doing this!

@dlorenc
Copy link
Contributor

dlorenc commented Oct 26, 2016

This should fix #55 by making it obsolete.

@philips
Copy link
Contributor

philips commented Oct 28, 2016

Nice!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Localkube should vendor kube-dns instead of the current kube2sky solution
6 participants