diff options
author | Thong Kuah <tkuah@gitlab.com> | 2018-09-07 06:07:47 +0300 |
---|---|---|
committer | Thong Kuah <tkuah@gitlab.com> | 2018-09-14 07:26:51 +0300 |
commit | c9af170d9aeeb39dbb41a99c00402beb384da0e9 (patch) | |
tree | 53544844fd8ac75f0fc2f2d44595b01089fad874 /app/services/clusters | |
parent | 2e47e1f80e000fb717f89effef983bf22c9e2f4d (diff) |
Create a GKE cluster with legacy_abac disabled when the `:rbac_clusters` feature flag is enabled
Explicitly persist the legacy_abac value of the cluster_provider_gcp so that we can disable abac if the `:rbac_clusters` feature flag is enabled
Diffstat (limited to 'app/services/clusters')
-rw-r--r-- | app/services/clusters/create_service.rb | 5 | ||||
-rw-r--r-- | app/services/clusters/gcp/provision_service.rb | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/services/clusters/create_service.rb b/app/services/clusters/create_service.rb index e3e0cfa462c..eb171daa694 100644 --- a/app/services/clusters/create_service.rb +++ b/app/services/clusters/create_service.rb @@ -25,11 +25,16 @@ module Clusters params[:provider_gcp_attributes].try do |provider| provider[:access_token] = access_token + provider[:legacy_abac] = legacy_abac_value end @cluster_params = params.merge(user: current_user, projects: [project]) end + def legacy_abac_value + !Feature.enabled?(:rbac_clusters) + end + def can_create_cluster? project.clusters.empty? end diff --git a/app/services/clusters/gcp/provision_service.rb b/app/services/clusters/gcp/provision_service.rb index 0d8b39a552b..80040511ec2 100644 --- a/app/services/clusters/gcp/provision_service.rb +++ b/app/services/clusters/gcp/provision_service.rb @@ -28,7 +28,7 @@ module Clusters provider.cluster.name, provider.num_nodes, machine_type: provider.machine_type, - legacy_abac: true + legacy_abac: provider.legacy_abac ) unless operation.status == 'PENDING' || operation.status == 'RUNNING' |