pyrox.dev
Merge pull request #31621 from NeQuissimus/minikube_localkube
minikube: Use localkube
authored by Tim Steinbach and committed by GitHub 905b7a6e 57e737f5
+4
pkgs/applications/networking/cluster/minikube/default.nix
+4
pkgs/applications/networking/cluster/minikube/default.nix
···
34
sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
35
};
36
37
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
38
# that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
39
buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
···
34
sha256 = "1f7kjn26y7knmab5avj8spb40ny1y0jix5j5p0dqfjvg9climl0h";
35
};
36
37
+
patches = [
38
+
./localkube.patch
39
+
];
40
+
41
# kubernetes is here only to shut up a loud warning when generating the completions below. minikube checks very eagerly
42
# that kubectl is on the $PATH, even if it doesn't use it at all to generate the completions
43
buildInputs = [ go-bindata makeWrapper kubernetes gpgme ] ++ stdenv.lib.optional hostPlatform.isDarwin vmnet;
+20
pkgs/applications/networking/cluster/minikube/localkube.patch
+20
pkgs/applications/networking/cluster/minikube/localkube.patch
···
···
1
+
diff --git a/pkg/minikube/bootstrapper/localkube/localkube.go b/pkg/minikube/bootstrapper/localkube/localkube.go
2
+
index 1c4b5000..c9f120d4 100644
3
+
--- a/pkg/minikube/bootstrapper/localkube/localkube.go
4
+
+++ b/pkg/minikube/bootstrapper/localkube/localkube.go
5
+
@@ -113,14 +113,9 @@ func (lk *LocalkubeBootstrapper) UpdateCluster(config bootstrapper.KubernetesCon
6
+
7
+
copyableFiles := []assets.CopyableFile{}
8
+
var localkubeFile assets.CopyableFile
9
+
- var err error
10
+
11
+
//add url/file/bundled localkube to file list
12
+
- lCacher := localkubeCacher{config}
13
+
- localkubeFile, err = lCacher.fetchLocalkubeFromURI()
14
+
- if err != nil {
15
+
- return errors.Wrap(err, "Error updating localkube from uri")
16
+
- }
17
+
+ localkubeFile = assets.NewBinDataAsset("out/localkube", "/", "localkube", "0777")
18
+
copyableFiles = append(copyableFiles, localkubeFile)
19
+
20
+
// user added files