diff options
| author | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-08 00:51:43 +0300 |
|---|---|---|
| committer | walkafwalka <2865898-walkafwalka@users.noreply.gitlab.com> | 2019-03-08 02:25:48 +0300 |
| commit | 460797dec3dc143943390e86a09d6e6b45a465d8 (patch) | |
| tree | a5495703f3bfd1152929c84853322cd9a6812f15 /app/models/clusters/applications | |
| parent | 31cf53df4d766ef58d6d5be60d5fa2e380406fc8 (diff) | |
Add support for ingress hostnames
Diffstat (limited to 'app/models/clusters/applications')
| -rw-r--r-- | app/models/clusters/applications/ingress.rb | 1 | ||||
| -rw-r--r-- | app/models/clusters/applications/jupyter.rb | 4 | ||||
| -rw-r--r-- | app/models/clusters/applications/knative.rb | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/app/models/clusters/applications/ingress.rb b/app/models/clusters/applications/ingress.rb index 7c15aaa4825..567f1a2267f 100644 --- a/app/models/clusters/applications/ingress.rb +++ b/app/models/clusters/applications/ingress.rb @@ -48,6 +48,7 @@ module Clusters def schedule_status_update return unless installed? return if external_ip + return if external_hostname ClusterWaitForIngressIpAddressWorker.perform_async(name, id) end diff --git a/app/models/clusters/applications/jupyter.rb b/app/models/clusters/applications/jupyter.rb index 80205775b6a..7efcc175f9f 100644 --- a/app/models/clusters/applications/jupyter.rb +++ b/app/models/clusters/applications/jupyter.rb @@ -18,8 +18,10 @@ module Clusters def set_initial_status return unless not_installable? + return unless cluster&.application_ingress_available? - if cluster&.application_ingress_available? && cluster.application_ingress.external_ip + ingress = cluster.application_ingress + if ingress.external_ip || ingress.external_hostname self.status = 'installable' end end diff --git a/app/models/clusters/applications/knative.rb b/app/models/clusters/applications/knative.rb index 8d79b041b64..347c3c8c37f 100644 --- a/app/models/clusters/applications/knative.rb +++ b/app/models/clusters/applications/knative.rb @@ -66,6 +66,7 @@ module Clusters def schedule_status_update return unless installed? return if external_ip + return if external_hostname ClusterWaitForIngressIpAddressWorker.perform_async(name, id) end |