diff options
| author | Tiger <twatson@gitlab.com> | 2019-06-07 11:24:59 +1000 |
|---|---|---|
| committer | Tiger <twatson@gitlab.com> | 2019-06-18 09:09:11 +1000 |
| commit | 5aa9b710be2e03b296b68942d4053fa0a24e884c (patch) | |
| tree | 5c7e49194490d49422196c1fbf935058a2199bee /app/controllers/clusters | |
| parent | 11810cb2b7185202c5178557ebb6205b27ed4148 (diff) | |
| download | gitlab-ce-5aa9b710be2e03b296b68942d4053fa0a24e884c.tar.gz | |
Allow switching clusters between managed/unmanaged
Any resources created while the cluster was managed
will be untouched, allowing users to set/unset this
flag as they please.
Diffstat (limited to 'app/controllers/clusters')
| -rw-r--r-- | app/controllers/clusters/clusters_controller.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/controllers/clusters/clusters_controller.rb b/app/controllers/clusters/clusters_controller.rb index 80ee7c35906..ec8077d18e3 100644 --- a/app/controllers/clusters/clusters_controller.rb +++ b/app/controllers/clusters/clusters_controller.rb @@ -128,6 +128,7 @@ class Clusters::ClustersController < Clusters::BaseController :enabled, :name, :environment_scope, + :managed, :base_domain, platform_kubernetes_attributes: [ :api_url, @@ -140,6 +141,7 @@ class Clusters::ClustersController < Clusters::BaseController params.require(:cluster).permit( :enabled, :environment_scope, + :managed, :base_domain, platform_kubernetes_attributes: [ :namespace |