summaryrefslogtreecommitdiff
path: root/app/services/ci
diff options
context:
space:
mode:
authorKamil Trzcinski <ayufan@ayufan.eu>2017-10-03 23:26:26 +0200
committerKamil Trzcinski <ayufan@ayufan.eu>2017-10-03 23:26:26 +0200
commitc471430a13c79a82555ee171fecdf45b882a3c19 (patch)
tree6c0fc8b3257e1dd023d7e844a0e89b98b6fc831f /app/services/ci
parent7e3e8ae81b7d20db718ff3b3afb27e6b92496af7 (diff)
downloadgitlab-ce-c471430a13c79a82555ee171fecdf45b882a3c19.tar.gz
Gcp::Cluster improvements
- introduce state machine - use before transitions to clear data - introduce namespace validation
Diffstat (limited to 'app/services/ci')
-rw-r--r--app/services/ci/integrate_cluster_service.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/app/services/ci/integrate_cluster_service.rb b/app/services/ci/integrate_cluster_service.rb
index c60d3722373..959c425fe74 100644
--- a/app/services/ci/integrate_cluster_service.rb
+++ b/app/services/ci/integrate_cluster_service.rb
@@ -2,7 +2,15 @@ module Ci
class IntegrateClusterService
def execute(cluster, endpoint, ca_cert, token, username, password)
Gcp::Cluster.transaction do
- cluster.created!(endpoint, ca_cert, token, username, password)
+ cluster.update!(
+ enabled: true,
+ endpoint: endpoint,
+ ca_cert: ca_cert,
+ kubernetes_token: token,
+ username: username,
+ password: password,
+ service: project.find_or_initialize_service('kubernetes'),
+ status_event: :created)
cluster.service.update!(
active: true,