diff options
| author | Matija Čupić <matteeyah@gmail.com> | 2017-12-16 17:28:59 +0100 |
|---|---|---|
| committer | Matija Čupić <matteeyah@gmail.com> | 2017-12-16 17:28:59 +0100 |
| commit | 9616e70a08b3900ae3a605ffbbe7ef5ebc763068 (patch) | |
| tree | c7d740aa4f58431c63548c274b6c4fddd39313e6 | |
| parent | 306967478734418ec0fc5f011204464b961cc409 (diff) | |
| download | gitlab-ce-9616e70a08b3900ae3a605ffbbe7ef5ebc763068.tar.gz | |
Allow environment_scope in cluster controllers
| -rw-r--r-- | app/controllers/projects/clusters/gcp_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/clusters/user_controller.rb | 1 | ||||
| -rw-r--r-- | app/controllers/projects/clusters_controller.rb | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/app/controllers/projects/clusters/gcp_controller.rb b/app/controllers/projects/clusters/gcp_controller.rb index b64f7a2a6bd..d3b9d8a9bbc 100644 --- a/app/controllers/projects/clusters/gcp_controller.rb +++ b/app/controllers/projects/clusters/gcp_controller.rb @@ -39,6 +39,7 @@ class Projects::Clusters::GcpController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, provider_gcp_attributes: [ :gcp_project_id, :zone, diff --git a/app/controllers/projects/clusters/user_controller.rb b/app/controllers/projects/clusters/user_controller.rb index d7678512073..d0db64b2fa9 100644 --- a/app/controllers/projects/clusters/user_controller.rb +++ b/app/controllers/projects/clusters/user_controller.rb @@ -26,6 +26,7 @@ class Projects::Clusters::UserController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, platform_kubernetes_attributes: [ :namespace, :api_url, diff --git a/app/controllers/projects/clusters_controller.rb b/app/controllers/projects/clusters_controller.rb index 4a7879db313..1dc7f1b3a7f 100644 --- a/app/controllers/projects/clusters_controller.rb +++ b/app/controllers/projects/clusters_controller.rb @@ -87,6 +87,7 @@ class Projects::ClustersController < Projects::ApplicationController if cluster.managed? params.require(:cluster).permit( :enabled, + :environment_scope, platform_kubernetes_attributes: [ :namespace ] @@ -95,6 +96,7 @@ class Projects::ClustersController < Projects::ApplicationController params.require(:cluster).permit( :enabled, :name, + :environment_scope, platform_kubernetes_attributes: [ :api_url, :token, |