diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:24 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-02-27 18:09:24 +0300 |
commit | f8d15ca65390475e356b06dedc51e10ccd179f86 (patch) | |
tree | ef916d4e8e11c9e00d809e5cdcf63814e86d6e89 /app/services/clusters | |
parent | 3ab4feda4dce9c9f0672375ae27c2f7c2ba6f4ad (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/services/clusters')
-rw-r--r-- | app/services/clusters/applications/base_service.rb | 6 | ||||
-rw-r--r-- | app/services/clusters/kubernetes/configure_istio_ingress_service.rb | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/app/services/clusters/applications/base_service.rb b/app/services/clusters/applications/base_service.rb index 2585d815e07..a3b39f0994d 100644 --- a/app/services/clusters/applications/base_service.rb +++ b/app/services/clusters/applications/base_service.rb @@ -35,6 +35,12 @@ module Clusters application.oauth_application = create_oauth_application(application, request) end + if application.instance_of?(Knative) + Serverless::AssociateDomainService + .new(application, pages_domain_id: params[:pages_domain_id], creator: current_user) + .execute + end + worker = worker_class(application) application.make_scheduled! diff --git a/app/services/clusters/kubernetes/configure_istio_ingress_service.rb b/app/services/clusters/kubernetes/configure_istio_ingress_service.rb index fe577beaa8a..a81014d99ff 100644 --- a/app/services/clusters/kubernetes/configure_istio_ingress_service.rb +++ b/app/services/clusters/kubernetes/configure_istio_ingress_service.rb @@ -27,6 +27,10 @@ module Clusters return configure_certificates if serverless_domain_cluster configure_passthrough + rescue Kubeclient::HttpError => e + knative.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code }) + rescue StandardError + knative.make_errored!(_('Failed to update.')) end private |