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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
e7acc881
Commit
e7acc881
authored
Jul 06, 2017
by
Lin Jen-Shin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename KUBECONFIG_FILE to KUBECONFIG
parent
ef7deb18
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
4 deletions
+4
-4
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+1
-1
changelogs/unreleased/33360-generate-kubeconfig.yml
changelogs/unreleased/33360-generate-kubeconfig.yml
+1
-1
doc/user/project/integrations/kubernetes.md
doc/user/project/integrations/kubernetes.md
+1
-1
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+1
-1
No files found.
app/models/project_services/kubernetes_service.rb
View file @
e7acc881
...
@@ -102,7 +102,7 @@ class KubernetesService < DeploymentService
...
@@ -102,7 +102,7 @@ class KubernetesService < DeploymentService
{
key:
'KUBE_URL'
,
value:
api_url
,
public:
true
},
{
key:
'KUBE_URL'
,
value:
api_url
,
public:
true
},
{
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
},
{
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
},
{
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
,
public:
true
},
{
key:
'KUBE_NAMESPACE'
,
value:
actual_namespace
,
public:
true
},
{
key:
'KUBECONFIG
_FILE
'
,
value:
config
,
public:
false
,
file:
true
}
{
key:
'KUBECONFIG'
,
value:
config
,
public:
false
,
file:
true
}
]
]
if
ca_pem
.
present?
if
ca_pem
.
present?
...
...
changelogs/unreleased/33360-generate-kubeconfig.yml
View file @
e7acc881
---
---
title
:
Provide KUBECONFIG
_FILE
from KubernetesService for runners
title
:
Provide KUBECONFIG from KubernetesService for runners
merge_request
:
12223
merge_request
:
12223
author
:
author
:
doc/user/project/integrations/kubernetes.md
View file @
e7acc881
...
@@ -55,7 +55,7 @@ GitLab CI build environment:
...
@@ -55,7 +55,7 @@ GitLab CI build environment:
-
`KUBE_CA_PEM_FILE`
- only present if a custom CA bundle was specified. Path
-
`KUBE_CA_PEM_FILE`
- only present if a custom CA bundle was specified. Path
to a file containing PEM data.
to a file containing PEM data.
-
`KUBE_CA_PEM`
(deprecated)- only if a custom CA bundle was specified. Raw PEM data.
-
`KUBE_CA_PEM`
(deprecated)- only if a custom CA bundle was specified. Raw PEM data.
-
`KUBECONFIG
_FILE
`
- Path to a file containing kubeconfig for this deployment. CA bundle would be embedded if specified.
-
`KUBECONFIG`
- Path to a file containing kubeconfig for this deployment. CA bundle would be embedded if specified.
## Web terminals
## Web terminals
...
...
spec/models/project_services/kubernetes_service_spec.rb
View file @
e7acc881
...
@@ -221,7 +221,7 @@ describe KubernetesService, models: true, caching: true do
...
@@ -221,7 +221,7 @@ describe KubernetesService, models: true, caching: true do
{
key:
'KUBE_URL'
,
value:
'https://kube.domain.com'
,
public:
true
},
{
key:
'KUBE_URL'
,
value:
'https://kube.domain.com'
,
public:
true
},
{
key:
'KUBE_TOKEN'
,
value:
'token'
,
public:
false
},
{
key:
'KUBE_TOKEN'
,
value:
'token'
,
public:
false
},
{
key:
'KUBE_NAMESPACE'
,
value:
namespace
,
public:
true
},
{
key:
'KUBE_NAMESPACE'
,
value:
namespace
,
public:
true
},
{
key:
'KUBECONFIG
_FILE
'
,
value:
kubeconfig
,
public:
false
,
file:
true
},
{
key:
'KUBECONFIG'
,
value:
kubeconfig
,
public:
false
,
file:
true
},
{
key:
'KUBE_CA_PEM'
,
value:
'CA PEM DATA'
,
public:
true
},
{
key:
'KUBE_CA_PEM'
,
value:
'CA PEM DATA'
,
public:
true
},
{
key:
'KUBE_CA_PEM_FILE'
,
value:
'CA PEM DATA'
,
public:
true
,
file:
true
}
{
key:
'KUBE_CA_PEM_FILE'
,
value:
'CA PEM DATA'
,
public:
true
,
file:
true
}
)
)
...
...
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