Skip to content
Snippets Groups Projects
Commit cf9d4a9f authored by Evan Read's avatar Evan Read
Browse files

Merge branch 'patch-88' into 'master' 

Docs: Fixed description for `platform_kubernetes_attributes[ca_cert]` in Group clusters API doc.

See merge request !26450
parents 05c739cc 4e9462f6
No related branches found
No related tags found
5 merge requests!158514Fix CodeReviewMetrics worker failure with kwargs,!27224Update stable branch yorick/test-release-tools for automatic RC 12.9.0-rc20200313145923.ee.0,!26962WIP: Allow GMA groups to specify their own PAT expiry setting (2/2),!26450Docs: Fixed description for `platform_kubernetes_attributes[ca_cert]` in Group clusters API doc.,!24639WIP POC: Ss/realtime 2
Pipeline #123414650 failed
Stage: sync
Stage: prepare
Stage: fixtures
Stage: test
Stage: post-test
Stage: review-prepare
Stage: review
Stage: qa
Stage: pages
Hide whitespace changes
Inline Side-by-side
doc/api/group_clusters.md
+ 2
− 2
View file @ cf9d4a9f
......@@ -160,7 +160,7 @@ Parameters:
| `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 |
| `platform_kubernetes_attributes[token]` | string | yes | The token to authenticate against Kubernetes |
| `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate (needed if API is using a self-signed TLS certificate |
| `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. |
| `platform_kubernetes_attributes[authorization_type]` | string | no | The cluster authorization type: `rbac`, `abac` or `unknown_authorization`. Defaults to `rbac`. |
| `environment_scope` | string | no | The associated environment to the cluster. Defaults to `*` **(PREMIUM)** |
......@@ -227,7 +227,7 @@ Parameters:
| `domain` | string | no | The [base domain](../user/group/clusters/index.md#base-domain) of 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 (needed if API is using a self-signed TLS certificate |
| `platform_kubernetes_attributes[ca_cert]` | string | no | TLS certificate. Required if API is using a self-signed TLS certificate. |
| `environment_scope` | string | no | The associated environment to the cluster **(PREMIUM)** |
NOTE: **Note:**
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment