Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 57e737f57bbc
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 905b7a6e73db
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 14, 2017

  1. minikube: Use localkube

    @NeQuissimus
    NeQuissimus committed Nov 14, 2017
    Copy the full SHA
    aac784f View commit details

Commits on Nov 20, 2017

  1. Merge pull request #31621 from NeQuissimus/minikube_localkube 

    minikube: Use localkube
    @NeQuissimus
    NeQuissimus authored Nov 20, 2017
    Copy the full SHA
    905b7a6 View commit details
Showing with 24 additions and 0 deletions.
  1. +4 −0 pkgs/applications/networking/cluster/minikube/default.nix
  2. +20 −0 pkgs/applications/networking/cluster/minikube/localkube.patch
4 changes: 4 additions & 0 deletions pkgs/applications/networking/cluster/minikube/default.nix
View file
Original file line number Diff line number Diff line change
@@ -34,6 +34,10 @@ in buildGoPackage rec {
sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
};

patches = [
./localkube.patch
];

# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
# that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
20 changes: 20 additions & 0 deletions pkgs/applications/networking/cluster/minikube/localkube.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go
index 1c4b5000..c9f120d4 100644
--- a/pkg/minikube/bootstrapper/localkube/localkube.go
+++ b/pkg/minikube/bootstrapper/localkube/localkube.go
@@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon

copyableFiles := []assets.CopyableFile{}
var localkubeFile assets.CopyableFile
- var err error

//add url/file/bundled localkube to file list
- lCacher := localkubeCacher{config}
- localkubeFile, err = lCacher.fetchLocalkubeFromURI()
- if err != nil {
- return errors.Wrap(err, "Error updating localkube from uri")
- }
+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777")
copyableFiles = append(copyableFiles, localkubeFile)

// user added files