minikube: bundle kvm2 driver #41644
Merged
minikube: bundle kvm2 driver #41644
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
GrahamcOfBorg
added
10.rebuild-darwin: 0
|
Failure on aarch64-linux (full log) Attempted: minikube Partial log (click to expand)
|
|
Success on x86_64-linux (full log) Attempted: minikube Partial log (click to expand)
|
nlewo
requested changes
Jun 10, 2018
pkgs/top-level/all-packages.nix
Outdated
| @@ -16882,6 +16882,10 @@ with pkgs; | |||
|
|
|||
| minikube = callPackage ../applications/networking/cluster/minikube { | |||
| inherit (darwin.apple_sdk.frameworks) vmnet; | |||
| drivers = lib.optionals stdenv.isLinux [ | |||
There was a problem hiding this comment.
Could you move this in the argument definition in order to reduce the size of all-packages.nix?
There was a problem hiding this comment.
How would I do this cleanly? This comes to mind:
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
, pkgs, drivers ? stdenv.lib.optionals stdenv.isLinux [ pkgs.docker-machine-kvm pkgs.docker-machine-kvm2 ]
}:But I don't like adding a pkgs argument. Or do I do something like:
{ stdenv, buildGoPackage, fetchFromGitHub, fetchurl, go-bindata, libvirt, qemu
, gpgme, makeWrapper, hostPlatform, vmnet, python, pkgconfig
, kvmDriver ? stdenv.isLinux, docker-machine-kvm
, kvm2Driver ? stdenv.isLinux, docker-machine-kvm2
}:and handle those specifically in binPath?
There was a problem hiding this comment.
Why we could not just add docker-machine-kvm2 to the argument list as it is done for docker-machine-kvm? Moreover, docker-machine-kvm is supposed to be removed so it will remain only one driver.
There was a problem hiding this comment.
I agree with @nlewo: Just add that package as you do now (with docker-machine-kvm) and internally create a list of supported drivers.
let
drivers = filter (d: d != null) ([]
++ lib.optionals stdenv.isLinux [ docker-machine-kvm docker-machine-kvm2 ]
++ lib.optionals stdenv.isDarwn [ … ]
);
in …Note: I am not sure if the null filter is required here. Thought is that it will allow people to set inputs to null in their overrides and remove specific drivers if they do not want them to be available.
If you want to allow people to add packages (as drivers) that aren't specified within the minikube derivation: Add an extraDrivers argument that defaults to [] and add that to the list of drivers that are being assembled in the packages expression.
|
Success on x86_64-linux (full log) Attempted: minikube Partial log (click to expand)
|
|
Failure on aarch64-linux (full log) Attempted: minikube Partial log (click to expand)
|
|
Looks good to me. @nlewo any objections? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation for this change
See #34448
Add a
drivers ? []argument for bundling arbitrary binaries in the minikubePATH. This currently defaults to[ docker-machine-kvm docker-machine-kvm2 ]on Linux.A separate effort is here: #39438
Things done
sandboxinnix.confon non-NixOS)nix-shell -p nox --run "nox-review wip"./result/bin/)