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

etcd: 3.3.20 -> 3.3.21, etcd_3_4: init at 3.4.8 #88225

Merged
merged 3 commits into from May 20, 2020
Merged

Conversation

@zowoq
Copy link
Contributor

zowoq commented May 20, 2020

Motivation for this change

3.3 -> 3.4 isn't an easy version bump so I'd like to add 3.4 as a first step.

https://github.com/etcd-io/etcd/blob/master/CHANGELOG-3.4.md#v340-2019-08-30

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.

cc K8s people
@johanot @offlinehacker @saschagrunert @srhb

@offlinehacker
Copy link
Contributor

offlinehacker commented May 20, 2020

Why do we need two versions is 3.3 incompatible with 3.4?

@zowoq
Copy link
Contributor Author

zowoq commented May 20, 2020

Why do we need two versions is 3.3 incompatible with 3.4?

For 3.4 the API defaults to v3 and has changes to how it handles crypto.

The modules and tests would seem to need (non-trivial?) changes to support 3.4.

I'd like to make 3.4 available for other platforms (and NixOS) for now until we can migrate from 3.3 to 3.4.

description = "Distributed reliable key-value store for the most critical data of a distributed system";
license = licenses.asl20;
homepage = "https://etcd.io/";
maintainers = with maintainers; [ offline ];

This comment has been minimized.

Copy link
@offlinehacker

offlinehacker May 20, 2020

Contributor

Can you add yourself as maintainer?

This comment has been minimized.

Copy link
@zowoq

zowoq May 20, 2020

Author Contributor

Added myself to both.

@zowoq zowoq force-pushed the zowoq:etcd branch from 0ae1ff1 to 30aeac7 May 20, 2020
@zowoq zowoq force-pushed the zowoq:etcd branch from 30aeac7 to e0df66e May 20, 2020
@ofborg ofborg bot requested a review from offlinehacker May 20, 2020
@offlinehacker offlinehacker merged commit c342710 into NixOS:master May 20, 2020
16 checks passed
16 checks passed
Evaluation Performance Report Evaluator Performance Report
Details
etcd, etcd.passthru.tests, etcd_3_4, etcd_3_4.passthru.tests on aarch64-linux Success
Details
etcd, etcd.passthru.tests, etcd_3_4, etcd_3_4.passthru.tests on x86_64-linux Success
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="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./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="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./nixos/
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./nixos/
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./nixos/
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./pkgs/t
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="e0df66e"; rev="e0df66e6a236d5bf2b97ef170b4ba1f103f5a17a"; } ./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
@zowoq zowoq deleted the zowoq:etcd branch May 20, 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.