diff options
| author | Tim Steinbach <tim@nequissimus.com> | 2017-11-14 08:39:19 -0500 |
|---|---|---|
| committer | Tim Steinbach <tim@nequissimus.com> | 2017-11-14 08:39:19 -0500 |
| commit | aac784f356b593ff487a203e490dc70a82c377c2 (patch) | |
| tree | b83ee8eb201773d72312495483d5ff53fd95ce17 /pkgs/applications/networking/cluster | |
| parent | 33071830e76ee5e28026e959914dd70043bb8387 (diff) | |
| download | nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar.gz nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar.bz2 nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar.lz nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar.xz nixlib-aac784f356b593ff487a203e490dc70a82c377c2.tar.zst nixlib-aac784f356b593ff487a203e490dc70a82c377c2.zip | |
minikube: Use localkube
Diffstat (limited to 'pkgs/applications/networking/cluster')
| -rw-r--r-- | pkgs/applications/networking/cluster/minikube/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/applications/networking/cluster/minikube/localkube.patch | 20 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 00ee3a3771eb..e8138713bae5 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -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 ]; diff --git a/pkgs/applications/networking/cluster/minikube/localkube.patch b/pkgs/applications/networking/cluster/minikube/localkube.patch new file mode 100644 index 000000000000..08ec85813a3e --- /dev/null +++ b/pkgs/applications/networking/cluster/minikube/localkube.patch @@ -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 |