diff options
| author | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-17 08:43:48 +0000 |
|---|---|---|
| committer | Kamil Trzciński <ayufan@ayufan.eu> | 2018-09-17 08:43:48 +0000 |
| commit | 5a8908bf587a0723b07e510dd6118a686d49af98 (patch) | |
| tree | a19af868a1b0a7c676b56a43372811a662754b6f /app/controllers | |
| parent | ba40c7f1c32f62ad5370621f049500aa904149cd (diff) | |
| parent | 528b060b89c2d6a6be611e88ceed28cfe86e167c (diff) | |
| download | gitlab-ce-5a8908bf587a0723b07e510dd6118a686d49af98.tar.gz | |
Merge branch '29398-support-rbac-for-gitlab-provisioned-clusters' into 'master'
Support Kubernetes RBAC for GitLab Managed Apps for creating new clusters
Closes #29398
See merge request gitlab-org/gitlab-ce!21401
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index b4fd09c06e5..eb0fad6cbb2 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -141,7 +141,8 @@ class Projects::ClustersController < Projects::ApplicationController :gcp_project_id, :zone, :num_nodes, - :machine_type + :machine_type, + :legacy_abac ]).merge( provider_type: :gcp, platform_type: :kubernetes |