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

Support a --rolling option for traefik reboots #393

Merged
merged 4 commits into from
Jul 19, 2023
Merged

Support a --rolling option for traefik reboots #393

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9ab448e
Support a --rolling option for traefik reboots
lewispb Jul 19, 2023
313f89a
Merge branch 'main' into rolling-traefik-restarts
lewispb Jul 19, 2023
ecfd258
Document the rolling reboot option
lewispb Jul 19, 2023
9d5a6d1
Document the rolling option for traefik reboots
lewispb Jul 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions lib/mrsk/cli/traefik.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,25 @@
class Mrsk::Cli::Traefik < Mrsk::Cli::Base
desc "boot", "Boot Traefik on servers"
def boot(login: true)
def boot
mutating do
on(MRSK.traefik_hosts) do
execute *MRSK.registry.login if login
execute *MRSK.registry.login
execute *MRSK.traefik.run, raise_on_non_zero_exit: false
end
end
end

method_option :rolling, type: :boolean, default: false
Copy link
Collaborator

Choose a reason for hiding this comment

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

We use option which is just an alias for method_option everywhere else - could you update for consistency?

desc "reboot", "Reboot Traefik on servers (stop container, remove container, start new container)"
def reboot
mutating do
on(MRSK.traefik_hosts) do
on(MRSK.traefik_hosts, in: options[:rolling] ? :sequence : :parallel) do
execute *MRSK.auditor.record("Rebooted traefik"), verbosity: :debug
execute *MRSK.registry.login
execute *MRSK.traefik.stop, raise_on_non_zero_exit: false
execute *MRSK.traefik.remove_container
execute *MRSK.traefik.run, raise_on_non_zero_exit: false
end

stop
remove_container
boot(login: false)
end
end

Expand Down
15 changes: 11 additions & 4 deletions test/cli/traefik_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@ class CliTraefikTest < CliTestCase

test "reboot" do
Mrsk::Commands::Registry.any_instance.expects(:login).twice
Mrsk::Cli::Traefik.any_instance.expects(:stop)
Mrsk::Cli::Traefik.any_instance.expects(:remove_container)
Mrsk::Cli::Traefik.any_instance.expects(:boot).with(login: false)

run_command("reboot")
run_command("reboot").tap do |output|
assert_match "docker container stop traefik", output
assert_match "docker container prune --force --filter label=org.opencontainers.image.title=Traefik", output
assert_match "docker run --name traefik --detach --restart unless-stopped --publish 80:80 --volume /var/run/docker.sock:/var/run/docker.sock --log-opt max-size=\"10m\" #{Mrsk::Commands::Traefik::DEFAULT_IMAGE} --providers.docker --log.level=\"DEBUG\"", output
end
end

test "reboot --rolling" do
run_command("reboot", "--rolling").tap do |output|
assert_match "Running docker container prune --force --filter label=org.opencontainers.image.title=Traefik on 1.1.1.1", output.lines[3]
end
end

test "start" do
Expand Down