Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
defce265
Commit
defce265
authored
Jul 19, 2017
by
Dimitrie Hoekstra
Committed by
Filipa Lacerda
Jul 19, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Resolve "Clarify k8s service keys"
parent
ed176f6f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
12 deletions
+17
-12
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+10
-10
changelogs/unreleased/33741-clarify-k8s-service-keys.yml
changelogs/unreleased/33741-clarify-k8s-service-keys.yml
+5
-0
doc/user/project/integrations/kubernetes.md
doc/user/project/integrations/kubernetes.md
+2
-2
No files found.
app/models/project_services/kubernetes_service.rb
View file @
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
...
...
changelogs/unreleased/33741-clarify-k8s-service-keys.yml
0 → 100644
View file @
defce265
---
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
:
doc/user/project/integrations/kubernetes.md
View file @
defce265
...
@@ -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,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment