consul: 0.9.3 -> 1.3.0 with vendored UI #49165

nh2 · 2018-10-26T16:39:13Z

Motivation for this change

Subsumes #48714, #44192, #41243, and #35602.

The key point is that we no longer have to build the Consul UI, it is vendored into the binary.

See commit messages for details.

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 nox --run "nox-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)
Fits CONTRIBUTING.md.

nh2 · 2018-10-26T16:40:24Z

CC @arianvp @vdemeester @c0bw3b

vdemeester

LGTM 🐯

arianvp · 2018-10-26T16:43:02Z

pkgs/servers/consul/default.nix


-buildGoPackage rec {
+buildGo110Package rec {


IS this a typo?

if not, I don't understand where this identifier comes from :)

Typo from my forward-port, fixed

nh2 · 2018-10-26T16:43:48Z

Btw, my usage of

python-consul
consul-alerts

in my staging deployment suggests that the they work well with this Consul upgrade.

c0bw3b · 2018-10-26T16:50:14Z

And with real chunks of documentation on top of it 🎉

arianvp · 2018-10-26T17:39:31Z

pkgs/servers/consul/default.nix

  rev = "v${version}";

  goPackagePath = "github.com/hashicorp/consul";

+  # Note: Currently only release tags are supported, because they have the Consul UI
+  # vendored. See
+  #   https://github.com/NixOS/nixpkgs/pull/48714#issuecomment-433454834


Perhaps add a link to #49082 here, so people know how such a build would look like?

c0bw3b · 2018-10-26T17:42:55Z

@GrahamcOfBorg build consul

GrahamcOfBorg · 2018-10-26T17:44:39Z

Success on aarch64-linux (full log)

Attempted: consul

Partial log (click to expand)

installing
post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin
shrinking /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin/bin/consul
shrinking /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin/bin/certgen
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin/bin
patching script interpreter paths in /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin
checking for references to /build in /nix/store/k82mvywcygqivd9v4m26anhn1rv60yr6-consul-1.3.0-bin...
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip

GrahamcOfBorg · 2018-10-26T18:01:29Z

Success on x86_64-linux (full log)

Attempted: consul

Partial log (click to expand)

post-installation fixup
shrinking RPATHs of ELF executables and libraries in /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin
shrinking /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin/bin/consul
shrinking /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin/bin/certgen
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin/bin
patching script interpreter paths in /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin
checking for references to /build in /nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin...
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
/nix/store/10pxm6lksdcmxylaavshjpw0riqyiyjd-consul-1.3.0-bin

c0bw3b · 2018-10-31T08:45:04Z

@nh2 could you rebase and solve the conflict with the release note XML please?

arianvp · 2018-10-31T16:32:52Z

I have one small change requests that we can add:

Set Type=notify on the systemd unit. Apparently this is supported.

When running under systemd on Linux, Consul notifies systemd by sending READY=1 to the $NOTIFY_SOCKET when a LAN join has completed. For this either the join or retry_join option has to be set and the service definition file has to have Type=notify set.
https://www.consul.io/docs/agent/basics.html#running-an-agent

nh2 · 2018-11-03T17:38:05Z

@arianvp Let's do that as part of a separate PR or issue, as this will require more testing.

Removes the old UI build tooling; it is no longer necessary because as of 1.2.0 it's bundled into the server binary. It doesn't even need to have JS built, because it's bundled into the release commit's source tree (see NixOS#48714). The UI is enabled by default, so the NixOS service is updated to directly use `ui = webUi;` now. Fixes NixOS#48714. Fixes NixOS#44192. Fixes NixOS#41243. Fixes NixOS#35602. Signed-off-by: Niklas Hambüchen <mail@nh2.me>

Signed-off-by: Niklas Hambüchen <mail@nh2.me>

nh2 · 2018-11-03T17:45:35Z

Rebased to fix release notes merge conflict

nh2 · 2018-11-03T20:17:07Z

I have one small change requests that we can add:

@arianvp Let's do that as part of a separate PR or issue, as this will require more testing.

Extracted as #49706

nh2 mentioned this pull request Oct 26, 2018

consul: 0.9.3 -> 1.3.0 #48714

Closed

9 tasks

vdemeester approved these changes Oct 26, 2018

View reviewed changes

arianvp reviewed Oct 26, 2018

View reviewed changes

GrahamcOfBorg added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 8.has: changelog 8.has: documentation This PR adds or changes documentation 8.has: module (update) This PR changes an existing module in `nixos/` labels Oct 26, 2018

nh2 force-pushed the consul-1.3.0 branch from 697554a to 79aa005 Compare October 26, 2018 16:47

GrahamcOfBorg added 8.has: clean-up 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 labels Oct 26, 2018

arianvp requested changes Oct 26, 2018

View reviewed changes

c0bw3b approved these changes Oct 26, 2018

View reviewed changes

nh2 force-pushed the consul-1.3.0 branch from 79aa005 to e36db6e Compare October 26, 2018 21:30

arianvp approved these changes Oct 26, 2018

View reviewed changes

nh2 mentioned this pull request Oct 29, 2018

systemd timers can result in changed services not being restarted reliably #49415

Open

nh2 added 2 commits November 3, 2018 18:39

nixos manual: Add changelog for consul

32c2d48

Signed-off-by: Niklas Hambüchen <mail@nh2.me>

nh2 force-pushed the consul-1.3.0 branch from e36db6e to 32c2d48 Compare November 3, 2018 17:45

c0bw3b merged commit 3234079 into NixOS:master Nov 3, 2018

nh2 mentioned this pull request Nov 3, 2018

consul service: Use Type=notify #49706

Open

1 task

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

consul: 0.9.3 -> 1.3.0 with vendored UI #49165

consul: 0.9.3 -> 1.3.0 with vendored UI #49165

nh2 commented Oct 26, 2018

nh2 commented Oct 26, 2018

vdemeester left a comment

arianvp Oct 26, 2018

arianvp Oct 26, 2018

nh2 Oct 26, 2018

nh2 commented Oct 26, 2018

c0bw3b commented Oct 26, 2018

arianvp Oct 26, 2018

nh2 Oct 26, 2018

c0bw3b commented Oct 26, 2018

GrahamcOfBorg commented Oct 26, 2018

GrahamcOfBorg commented Oct 26, 2018

c0bw3b commented Oct 31, 2018

arianvp commented Oct 31, 2018

nh2 commented Nov 3, 2018

nh2 commented Nov 3, 2018

nh2 commented Nov 3, 2018


		buildGoPackage rec {
		buildGo110Package rec {

consul: 0.9.3 -> 1.3.0 with vendored UI #49165

consul: 0.9.3 -> 1.3.0 with vendored UI #49165

Conversation

nh2 commented Oct 26, 2018

Motivation for this change

Things done

nh2 commented Oct 26, 2018

vdemeester left a comment

Choose a reason for hiding this comment

arianvp Oct 26, 2018

Choose a reason for hiding this comment

arianvp Oct 26, 2018

Choose a reason for hiding this comment

nh2 Oct 26, 2018

Choose a reason for hiding this comment

nh2 commented Oct 26, 2018

c0bw3b commented Oct 26, 2018

arianvp Oct 26, 2018

Choose a reason for hiding this comment

nh2 Oct 26, 2018

Choose a reason for hiding this comment

c0bw3b commented Oct 26, 2018

GrahamcOfBorg commented Oct 26, 2018

GrahamcOfBorg commented Oct 26, 2018

c0bw3b commented Oct 31, 2018

arianvp commented Oct 31, 2018

nh2 commented Nov 3, 2018

nh2 commented Nov 3, 2018

nh2 commented Nov 3, 2018