diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-04-14 18:09:44 +0300 |
| commit | 874ead9c3a50de4c4ca4551eaf5b7eb976d26b50 (patch) | |
| tree | 637ee9f2da5e251bc08ebf3e972209d51966bf7c /lib/api | |
| parent | 2e4c4055181eec9186458dd5dd3219c937032ec7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'lib/api')
| -rw-r--r-- | lib/api/group_clusters.rb | 1 | ||||
| -rw-r--r-- | lib/api/project_clusters.rb | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/lib/api/group_clusters.rb b/lib/api/group_clusters.rb index 0108f6feae3..2c12c6387fb 100644 --- a/lib/api/group_clusters.rb +++ b/lib/api/group_clusters.rb @@ -53,6 +53,7 @@ module API requires :name, type: String, desc: 'Cluster name' optional :enabled, type: Boolean, default: true, desc: 'Determines if cluster is active or not, defaults to true' optional :domain, type: String, desc: 'Cluster base domain' + optional :management_project_id, type: Integer, desc: 'The ID of the management project' optional :managed, type: Boolean, default: true, desc: 'Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true' requires :platform_kubernetes_attributes, type: Hash, desc: %q(Platform Kubernetes data) do requires :api_url, type: String, allow_blank: false, desc: 'URL to access the Kubernetes API' diff --git a/lib/api/project_clusters.rb b/lib/api/project_clusters.rb index b482980b88a..299301aabc4 100644 --- a/lib/api/project_clusters.rb +++ b/lib/api/project_clusters.rb @@ -56,6 +56,7 @@ module API requires :name, type: String, desc: 'Cluster name' optional :enabled, type: Boolean, default: true, desc: 'Determines if cluster is active or not, defaults to true' optional :domain, type: String, desc: 'Cluster base domain' + optional :management_project_id, type: Integer, desc: 'The ID of the management project' optional :managed, type: Boolean, default: true, desc: 'Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true' requires :platform_kubernetes_attributes, type: Hash, desc: %q(Platform Kubernetes data) do requires :api_url, type: String, allow_blank: false, desc: 'URL to access the Kubernetes API' |