Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThong Kuah <tkuah@gitlab.com>2018-11-15 05:28:29 +0300
committerThong Kuah <tkuah@gitlab.com>2018-12-05 00:16:44 +0300
commit546aa0cae4999176bf914a00893f25e177886c53 (patch)
treeb403eb7a96fb5294c13fb2a693e46f56fbed6987 /app/services
parent0e3f6251f56563bfafaee2680d6ea07f863df725 (diff)
Call ClusterPlatformConfigureWorker to re-use code
We remove configure_project_service_account and replace ClusterPlatformConfigureWorker as they perform exactly the same piece of work. This also makes GKE cluster creation to be the same as Adding existing cluster - they both now use another worker to execute CreateOrUpdateNamespaceService.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/clusters/gcp/finalize_creation_service.rb12
1 files changed, 2 insertions, 10 deletions
diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb
index 3df43657fa0..9efe8d85dee 100644
--- a/app/services/clusters/gcp/finalize_creation_service.rb
+++ b/app/services/clusters/gcp/finalize_creation_service.rb
@@ -12,7 +12,8 @@ module Clusters
create_gitlab_service_account!
configure_kubernetes
cluster.save!
- configure_project_service_account
+
+ ClusterPlatformConfigureWorker.perform_async(cluster.id)
rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e
provider.make_errored!("Failed to request to CloudPlatform; #{e.message}")
@@ -55,15 +56,6 @@ module Clusters
).execute
end
- def configure_project_service_account
- kubernetes_namespace = cluster.find_or_initialize_kubernetes_namespace(cluster.cluster_project)
-
- Clusters::Gcp::Kubernetes::CreateOrUpdateNamespaceService.new(
- cluster: cluster,
- kubernetes_namespace: kubernetes_namespace
- ).execute
- end
-
def authorization_type
create_rbac_cluster? ? 'rbac' : 'abac'
end