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 /doc/api | |
| parent | 2e4c4055181eec9186458dd5dd3219c937032ec7 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'doc/api')
| -rw-r--r-- | doc/api/group_clusters.md | 1 | ||||
| -rw-r--r-- | doc/api/project_clusters.md | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/doc/api/group_clusters.md b/doc/api/group_clusters.md index e9b4b2b92ab..01c6d59f60d 100644 --- a/doc/api/group_clusters.md +++ b/doc/api/group_clusters.md @@ -224,6 +224,7 @@ Parameters: | `cluster_id` | integer | yes | The ID of the cluster | | `name` | string | no | The name of the cluster | | `domain` | string | no | The [base domain](../user/group/clusters/index.md#base-domain) of the cluster | +| `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `platform_kubernetes_attributes[api_url]` | string | no | The URL to access the Kubernetes API | | `platform_kubernetes_attributes[token]` | string | no | The token to authenticate against Kubernetes | | `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. | diff --git a/doc/api/project_clusters.md b/doc/api/project_clusters.md index 2ed57eceb85..79800af2f59 100644 --- a/doc/api/project_clusters.md +++ b/doc/api/project_clusters.md @@ -179,6 +179,7 @@ Parameters: | `id` | integer | yes | The ID of the project owned by the authenticated user | | `name` | string | yes | The name of the cluster | | `domain` | string | no | The [base domain](../user/project/clusters/index.md#base-domain) of the cluster | +| `management_project_id` | integer | no | The ID of the [management project](../user/clusters/management_project.md) for the cluster | | `enabled` | boolean | no | Determines if cluster is active or not, defaults to true | | `managed` | boolean | no | Determines if GitLab will manage namespaces and service accounts for this cluster, defaults to true | | `platform_kubernetes_attributes[api_url]` | string | yes | The URL to access the Kubernetes API | |