Commit 2de72f4e authored by Filipa Lacerda's avatar Filipa Lacerda

Merge branch '33741-clarify-k8s-service-keys' into 'master'

Resolve "Clarify k8s service keys"

Closes #33741

See merge request !12188
parents ed176f6f defce265
...@@ -58,22 +58,22 @@ class KubernetesService < DeploymentService ...@@ -58,22 +58,22 @@ class KubernetesService < DeploymentService
def fields def fields
[ [
{ type: 'text',
name: 'namespace',
title: 'Kubernetes namespace',
placeholder: namespace_placeholder },
{ type: 'text', { type: 'text',
name: 'api_url', name: 'api_url',
title: 'API URL', title: 'API URL',
placeholder: 'Kubernetes API URL, like https://kube.example.com/' }, placeholder: 'Kubernetes API URL, like https://kube.example.com/' },
{ type: 'text',
name: 'token',
title: 'Service token',
placeholder: 'Service token' },
{ type: 'textarea', { type: 'textarea',
name: 'ca_pem', name: 'ca_pem',
title: 'Custom CA bundle', title: 'CA Certificate',
placeholder: 'Certificate Authority bundle (PEM format)' } placeholder: 'Certificate Authority bundle (PEM format)' },
{ type: 'text',
name: 'namespace',
title: 'Project namespace (optional/unique)',
placeholder: namespace_placeholder },
{ type: 'text',
name: 'token',
title: 'Token',
placeholder: 'Service token' }
] ]
end end
......
---
title: Clarifies and rearranges the input variables on the kubernetes integration
page and adjusts the docs slightly to meet the same order
merge_request: !12188
author:
...@@ -19,10 +19,10 @@ of your project and select the **Kubernetes** service to configure it. ...@@ -19,10 +19,10 @@ of your project and select the **Kubernetes** service to configure it.
The Kubernetes service takes the following arguments: The Kubernetes service takes the following arguments:
1. Kubernetes namespace
1. API URL 1. API URL
1. Service token
1. Custom CA bundle 1. Custom CA bundle
1. Kubernetes namespace
1. Service token
The API URL is the URL that GitLab uses to access the Kubernetes API. Kubernetes The API URL is the URL that GitLab uses to access the Kubernetes API. Kubernetes
exposes several APIs - we want the "base" URL that is common to all of them, exposes several APIs - we want the "base" URL that is common to all of them,
......
Markdown is supported
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