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
Léo-Paul Géneau
gitlab-ce
Commits
ba4a2c54
Commit
ba4a2c54
authored
Feb 20, 2017
by
Nick Thomas
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
parent
df63d9db
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
18 additions
and
2 deletions
+18
-2
app/models/project_services/kubernetes_service.rb
app/models/project_services/kubernetes_service.rb
+6
-1
changelogs/unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
...unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
+4
-0
doc/user/project/integrations/kubernetes.md
doc/user/project/integrations/kubernetes.md
+2
-1
spec/models/project_services/kubernetes_service_spec.rb
spec/models/project_services/kubernetes_service_spec.rb
+6
-0
No files found.
app/models/project_services/kubernetes_service.rb
View file @
ba4a2c54
...
...
@@ -94,7 +94,12 @@ class KubernetesService < DeploymentService
{
key:
'KUBE_TOKEN'
,
value:
token
,
public:
false
},
{
key:
'KUBE_NAMESPACE'
,
value:
namespace
,
public:
true
}
]
variables
<<
{
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
}
if
ca_pem
.
present?
if
ca_pem
.
present?
variables
<<
{
key:
'KUBE_CA_PEM'
,
value:
ca_pem
,
public:
true
}
variables
<<
{
key:
'KUBE_CA_PEM_FILE'
,
value:
ca_pem
,
public:
true
,
file:
true
}
end
variables
end
...
...
changelogs/unreleased/add-kube-ca-pem-file-deprecate-kube-ca-pem.yml
0 → 100644
View file @
ba4a2c54
---
title
:
Add KUBE_CA_PEM_FILE, deprecate KUBE_CA_PEM
merge_request
:
9398
author
:
doc/user/project/integrations/kubernetes.md
View file @
ba4a2c54
...
...
@@ -49,7 +49,8 @@ GitLab CI build environment:
-
`KUBE_URL`
- equal to the API URL
-
`KUBE_TOKEN`
-
`KUBE_NAMESPACE`
-
`KUBE_CA_PEM`
- only if a custom CA bundle was specified
-
`KUBE_CA_PEM_FILE`
- only present if a custom CA bundle was specified. Path to a file containing PEM data.
-
`KUBE_CA_PEM`
(deprecated)- only if a custom CA bundle was specified. Raw PEM data.
## Web terminals
...
...
spec/models/project_services/kubernetes_service_spec.rb
View file @
ba4a2c54
...
...
@@ -163,6 +163,12 @@ describe KubernetesService, models: true, caching: true do
{
key:
'KUBE_CA_PEM'
,
value:
'CA PEM DATA'
,
public:
true
}
)
end
it
'sets KUBE_CA_PEM_FILE'
do
expect
(
subject
.
predefined_variables
).
to
include
(
{
key:
'KUBE_CA_PEM_FILE'
,
value:
'CA PEM DATA'
,
public:
true
,
file:
true
}
)
end
end
describe
'#terminals'
do
...
...
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