From be8cf02e3adf7e59274068748945e431feb342b7 Mon Sep 17 00:00:00 2001 From: Zipofar Date: Wed, 28 Jun 2023 13:54:18 +0300 Subject: [PATCH] [430] Add base_ingress_host --- core/app/lib/uffizzi_core/concerns/models/cluster.rb | 2 +- .../controller/create_cluster/cluster_serializer.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/core/app/lib/uffizzi_core/concerns/models/cluster.rb b/core/app/lib/uffizzi_core/concerns/models/cluster.rb index 305912ba..077a5cd2 100644 --- a/core/app/lib/uffizzi_core/concerns/models/cluster.rb +++ b/core/app/lib/uffizzi_core/concerns/models/cluster.rb @@ -39,7 +39,7 @@ module UffizziCore::Concerns::Models::Cluster end event :disable, after: :after_disable do - transitions from: [:fail_deploy_namespace, :deploying, :deployed, :failed], to: :disabled + transitions from: [:failed_deploy_namespace, :deploying, :deployed, :failed], to: :disabled end end diff --git a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb index c84a39a5..5771f33b 100644 --- a/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb +++ b/core/app/serializers/uffizzi_core/controller/create_cluster/cluster_serializer.rb @@ -1,5 +1,9 @@ # frozen_string_literal: true class UffizziCore::Controller::CreateCluster::ClusterSerializer < UffizziCore::BaseSerializer - attributes :manifest + attributes :manifest, :base_ingress_host + + def base_ingress_host + Settings.app.managed_dns_zone + end end