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.

Sign up for GitHub

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

Jump to bottom

minikube: 1.2.0 -> 1.6.2 #66578

Merged
merged 6 commits into from Mar 18, 2020
Merged

minikube: 1.2.0 -> 1.6.2 #66578

merged 6 commits into from Mar 18, 2020

Conversation

AtkinsChang
Copy link
Contributor

@AtkinsChang AtkinsChang commented Aug 13, 2019 •
edited

Motivation for this change

Upgrade to v1.6.2 and fix bugs in previous version:

  • fix building errors and use buildGoModule for docker-machine-kvm2
  • fix minikube bugs running on nixos cause by exec /bin/bash command
  • separate docker-machine-hyperkit from minikube like what docker-machine-kvm2 did
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nix-review --run "nix-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.
Notify maintainers

cc @

@ofborg ofborg bot requested review from copumpkin and kalbasit August 13, 2019 18:19
@kalbasit kalbasit self-assigned this Aug 13, 2019
@mmahut
Copy link
Member

mmahut commented Aug 13, 2019

@GrahamcOfBorg build minikube docker-machine-hyperkit

@GrahamcOfBorg test docker

vdemeester
vdemeester approved these changes Aug 14, 2019
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

dhess added a commit to dhess/dhess-nix that referenced this pull request Oct 20, 2019
@dhess
Add minikube and friends.
296e65a 
This uses a more recent version than upstream nixpkgs. It also builds
docker-machine-hyperkit separately from minikube.

This is based on Atkins Chang's pull request:
NixOS/nixpkgs#66578

Note: the docker-machine-hyperkit minikube plugin is currently
disabled, because minikube on macOS needs to run it as root via
setuid, and this is incompatible with the Nix store. I don't know of a
way to wrap this appropriately on nix-darwin yet. At any rate,
minikube will download a compatible version automatically, and it
should work as long as hyperkit is in the minikube path, which this
minikube derivation does on macOS.
@brodul
Copy link
Contributor

brodul commented Nov 21, 2019

Can we push this forward. The nix pkgs minikube is getting old.

@AtkinsChang
Copy link
Contributor Author

I just wonder why there was a LGTM from maintainer on Aug 15 but duplicated pr #67242 created on Aug 22 was merged and causes conflicting. Is the issue management principle of this repository FIFO?

@vdemeester
Copy link
Member

I just wonder why there was a LGTM from maintainer on Aug 15 but duplicated pr #67242 created on Aug 22 was merged and causes conflicting. Is the issue management principle of this repository FIFO?

@AtkinsChang sorry about that 😓 it's open-source, sometimes a newer PR gets merged before an older one and causes conflicts, it happens 😅 Can you rebase yours 👼

@thmzlt
Copy link
Contributor

thmzlt commented Dec 3, 2019

I was able to update 1.2.0 -> 1.5.2 by bumping the minikube version in master (and updating the modSha256):

diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix
index 5637e486ef1..e107cb98212 100644
--- a/pkgs/applications/networking/cluster/minikube/default.nix
+++ b/pkgs/applications/networking/cluster/minikube/default.nix
@@ -13,7 +13,7 @@ let

 in buildGoModule rec {
   pname   = "minikube";
-  version = "1.2.0";
+  version = "1.5.2";

   kubernetesVersion = "1.15.0";

@@ -26,7 +26,7 @@ in buildGoModule rec {
     sha256 = "0l9znrp49877cp1bkwx84c8lv282ga5a946rjbxi8gznkf3kwaw7";
   };

-  modSha256 = "1cp63n0x2lgbqvvymx9byx48r42qw6w224x5x4iiarc2nryfdhn0";
+  modSha256 = "1spyc71jfa05dyf30q30hjk2lx5w7929jsm3p03gbm6ssvmclfrh";

   buildInputs = [ go-bindata makeWrapper gpgme ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin vmnet;
   subPackages = [ "cmd/minikube" ] ++ stdenv.lib.optional stdenv.hostPlatform.isDarwin "cmd/drivers/hyperkit";

@AtkinsChang
Copy link
Contributor Author

@vdemeester although it works on my machine, it would be great that you can help to double verify the new version

@AtkinsChang AtkinsChang changed the title minikube: 1.2.0 -> 1.3.1 minikube: 1.2.0 -> 1.5.2 Dec 4, 2019
@vdemeester
Copy link
Member

@AtkinsChang hum, interesting, I've got a different error that the CI :

error: while evaluating 'callPackageWith' at /home/vincent/.cache/nix-review/pr-6657
8/nixpkgs/lib/customisation.nix:117:35, called from /home/vincent/.cache/nix-review$
pr-66578/nixpkgs/pkgs/top-level/all-packages.nix:18394:31:
while evaluating 'makeOverridable' at /home/vincent/.cache/nix-review/pr-66578/nixpk
gs/lib/customisation.nix:67:24, called from /home/vincent/.cache/nix-review/pr-66578
/nixpkgs/lib/customisation.nix:121:8:
anonymous function at /home/vincent/.cache/nix-review/pr-66578/nixpkgs/pkgs/applicat
ions/networking/cluster/docker-machine/xhyve.nix:1:1 called with unexpected argument
 'minikube', at /home/vincent/.cache/nix-review/pr-66578/nixpkgs/lib/customisation.n
ix:69:16

@AtkinsChang
Copy link
Contributor Author

@vdemeester it should be good now

vdemeester
vdemeester approved these changes Dec 5, 2019
View reviewed changes
Copy link
Member

@vdemeester vdemeester left a comment

Choose a reason for hiding this comment

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

LGTM 🐯

@flokli
Copy link
Contributor

flokli commented Dec 24, 2019

Can we drop the minikube-beta commit? There has been some new releases already, and it might make sense to just bump to the latest minikube release in a followup PR.

@AtkinsChang AtkinsChang changed the title minikube: 1.2.0 -> 1.5.2 minikube: 1.2.0 -> 1.6.2 Dec 27, 2019
@AtkinsChang
Copy link
Contributor Author

@flokli
because this pr keep pending since Aug 2019 and I have rebased this three times

virtualbox driver works well but kvm driver is not working because of libvirt bug related to ebtables
I may submit another pr to fix libvirt this weekend

@flokli
Copy link
Contributor

flokli commented Jan 9, 2020

@AtkinsChang sorry for the delay! I can't really test the virtualbox backend anymore.

Did you get a chance to fix the libvirt backend? Missed a reference here.

@AtkinsChang
Copy link
Contributor Author

AtkinsChang commented Mar 7, 2020 •
edited

@flokli libvirt is good with this version of minikube
@kalbasit any chance to close this long live pr?

@Mic92 Mic92 merged commit 201ac90 into NixOS:master Mar 18, 2020
@flokli
Copy link
Contributor

flokli commented Mar 18, 2020

Unfortunately I couldn't find time to test it properly so far. Thanks @AtkinsChang for the PR, and thanks @Mic92 for merging it! 👍

@AtkinsChang AtkinsChang deleted the minikube branch August 8, 2021 05:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@copumpkin copumpkin Awaiting requested review from copumpkin

@kalbasit kalbasit Awaiting requested review from kalbasit

@ebzzry ebzzry Awaiting requested review from ebzzry

@tadfisher tadfisher Awaiting requested review from tadfisher

@vdemeester vdemeester Awaiting requested review from vdemeester

Assignees

@kalbasit kalbasit

Labels
8.has: documentation 8.has: package (new) 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 11.by: package-maintainer
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
8 participants
@AtkinsChang @mmahut @brodul @vdemeester @thmzlt @flokli @kalbasit @Mic92