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.

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

Updated kind from 0.7 -> 0.8.1 #87696

Merged
merged 1 commit into from May 12, 2020
Merged

Updated kind from 0.7 -> 0.8.1 #87696

merged 1 commit into from May 12, 2020

Conversation

@shuhaowu
Copy link
Contributor

shuhaowu commented May 12, 2020

Motivation for this change

KinD fixed an issue where docker restart would cause the Kubernetes instance to fail in 0.8.0: kubernetes-sigs/kind#148. This PR bumps the nix version to 0.8.1.

There actually seems to be an issue with building this package with the vgo2nix generated deps.nix file, it fails with the following error but I've yet to trace down the problem:

.......
building
go/src/sigs.k8s.io/kind/pkg/cluster/internal/patch/json6902patch.go:20:2: cannot find package "github.com/evanphx/json-patch/v5" in any of:
        /nix/store/1r61f7iwqfb6dm1krqpj9cjfifjnfmjx-go-1.14.2/share/go/src/github.com/evanphx/json-patch/v5 (from $GOROOT)
        /build/go/src/github.com/evanphx/json-patch/v5 (from $GOPATH)
builder for '/nix/store/skv11yxvpsy8zcyiqba8gcar83wdiyy4-kind-0.8.1.drv' failed with exit code 1

Instead, what I did is update the nix file to use the new buildGoModule system instead. This appears to work.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-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.
Also use buildGoModule instead of buildGoPackages
@shuhaowu shuhaowu force-pushed the shuhaowu:update-kind-081 branch from ed0d648 to e7bbcb3 May 12, 2020
@shuhaowu shuhaowu changed the title WIP: Updated kind from 0.7 -> 0.8.1 Updated kind from 0.7 -> 0.8.1 May 12, 2020
@ofborg ofborg bot requested review from kalbasit, offlinehacker and rawkode May 12, 2020
@Mic92
Copy link
Contributor

Mic92 commented May 12, 2020

Result of nixpkgs-review pr 87696 1

1 package built:
- kind
@Mic92 Mic92 merged commit 67c6a2e into NixOS:master May 12, 2020
14 checks passed
14 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-darwin nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./pkgs/t
Details
grahamcofborg-eval-lib-tests nix-build --arg pkgs import ./. {} ./lib/tests/release.nix
Details
grahamcofborg-eval-nixos nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e7bbcb3"; rev="e7bbcb3cb6cea26188dc3a89da068e11fabe4aa9"; } ./pkgs/t
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
@shuhaowu shuhaowu deleted the shuhaowu:update-kind-081 branch May 12, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.