Apply --hosts and --roles filters to traefik hosts as well.
This commit is contained in:
@@ -19,7 +19,7 @@ class Kamal::Commander::Specifics
|
|||||||
end
|
end
|
||||||
|
|
||||||
def traefik_hosts
|
def traefik_hosts
|
||||||
specific_hosts || config.traefik_hosts
|
config.traefik_hosts & specified_hosts
|
||||||
end
|
end
|
||||||
|
|
||||||
def accessory_hosts
|
def accessory_hosts
|
||||||
|
|||||||
@@ -131,6 +131,20 @@ class CommanderTest < ActiveSupport::TestCase
|
|||||||
assert_equal [ "1.1.1.3", "1.1.1.4", "1.1.1.1", "1.1.1.2" ], @kamal.hosts
|
assert_equal [ "1.1.1.3", "1.1.1.4", "1.1.1.1", "1.1.1.2" ], @kamal.hosts
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "traefik hosts should observe filtered roles" do
|
||||||
|
configure_with(:deploy_with_aliases)
|
||||||
|
|
||||||
|
@kamal.specific_roles = [ "web_tokyo" ]
|
||||||
|
assert_equal [ "1.1.1.3", "1.1.1.4" ], @kamal.traefik_hosts
|
||||||
|
end
|
||||||
|
|
||||||
|
test "traefik hosts should observe filtered hosts" do
|
||||||
|
configure_with(:deploy_with_aliases)
|
||||||
|
|
||||||
|
@kamal.specific_hosts = [ "1.1.1.4" ]
|
||||||
|
assert_equal [ "1.1.1.4" ], @kamal.traefik_hosts
|
||||||
|
end
|
||||||
|
|
||||||
private
|
private
|
||||||
def configure_with(variant)
|
def configure_with(variant)
|
||||||
@kamal = Kamal::Commander.new.tap do |kamal|
|
@kamal = Kamal::Commander.new.tap do |kamal|
|
||||||
|
|||||||
@@ -83,6 +83,15 @@ class ConfigurationTest < ActiveSupport::TestCase
|
|||||||
assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3" ], config.traefik_hosts
|
assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3" ], config.traefik_hosts
|
||||||
end
|
end
|
||||||
|
|
||||||
|
test "filtered traefik hosts" do
|
||||||
|
assert_equal [ "1.1.1.1", "1.1.1.2" ], @config_with_roles.traefik_hosts
|
||||||
|
|
||||||
|
@deploy_with_roles[:servers]["workers"]["traefik"] = true
|
||||||
|
config = Kamal::Configuration.new(@deploy_with_roles)
|
||||||
|
|
||||||
|
assert_equal [ "1.1.1.1", "1.1.1.2", "1.1.1.3" ], config.traefik_hosts
|
||||||
|
end
|
||||||
|
|
||||||
test "version no git repo" do
|
test "version no git repo" do
|
||||||
ENV.delete("VERSION")
|
ENV.delete("VERSION")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user