diff --git a/core/app/lib/uffizzi_core/concerns/models/deployment.rb b/core/app/lib/uffizzi_core/concerns/models/deployment.rb index b64aba9d..f477ece1 100644 --- a/core/app/lib/uffizzi_core/concerns/models/deployment.rb +++ b/core/app/lib/uffizzi_core/concerns/models/deployment.rb @@ -9,6 +9,7 @@ module UffizziCore::Concerns::Models::Deployment include UffizziCore::StateMachineConcern include UffizziCore::DeploymentRepo extend Enumerize + include UffizziCore::DependencyInjectionConcern self.table_name = UffizziCore.table_names[:deployments] @@ -71,7 +72,8 @@ def clean end def preview_url - "#{subdomain}.#{Settings.app.managed_dns_zone}" + managed_dns_zone = controller_settings_service.deployment(self).managed_dns_zone + "#{subdomain}.#{managed_dns_zone}" end def namespace diff --git a/core/app/services/uffizzi_core/controller_service.rb b/core/app/services/uffizzi_core/controller_service.rb index ea823581..5ad6b10a 100644 --- a/core/app/services/uffizzi_core/controller_service.rb +++ b/core/app/services/uffizzi_core/controller_service.rb @@ -145,7 +145,7 @@ def request_events(deployment) def controller_client(deployable) settings = case deployable when UffizziCore::Deployment - Settings.controller + controller_settings_service.deployment(deployable) when UffizziCore::Cluster controller_settings_service.vcluster(deployable) else diff --git a/core/app/services/uffizzi_core/controller_settings_service.rb b/core/app/services/uffizzi_core/controller_settings_service.rb index 6e4401aa..056fa4c9 100644 --- a/core/app/services/uffizzi_core/controller_settings_service.rb +++ b/core/app/services/uffizzi_core/controller_settings_service.rb @@ -5,5 +5,11 @@ class << self def vcluster(_cluster) Settings.vcluster_controller end + + def deployment(_cluster) + Settings.controller.deep_dup.tap do |s| + s.managed_dns_zone = Settings.app.managed_dns_zone + end + end end end