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
6b527478
Commit
6b527478
authored
Nov 14, 2019
by
Thong Kuah
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'helm-v2.16.1' into 'master'
Helm v2.16.1 See merge request gitlab-org/gitlab!19981
parents
3ac4f84d
00e7aed4
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
4 deletions
+9
-4
changelogs/unreleased/helm-v2-16-1.yml
changelogs/unreleased/helm-v2-16-1.yml
+5
-0
lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
...i/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
+1
-1
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
+1
-1
lib/gitlab/kubernetes/helm.rb
lib/gitlab/kubernetes/helm.rb
+1
-1
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
+1
-1
No files found.
changelogs/unreleased/helm-v2-16-1.yml
0 → 100644
View file @
6b527478
---
title
:
Helm v2.16.1
merge_request
:
19981
author
:
type
:
fixed
lib/gitlab/ci/templates/Jobs/DAST-Default-Branch-Deploy.gitlab-ci.yml
View file @
6b527478
.dast-auto-deploy
:
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.
4
.0"
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.
6
.0"
dast_environment_deploy
:
extends
:
.dast-auto-deploy
...
...
lib/gitlab/ci/templates/Jobs/Deploy.gitlab-ci.yml
View file @
6b527478
.auto-deploy
:
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.
4
.0"
image
:
"
registry.gitlab.com/gitlab-org/cluster-integration/auto-deploy-image:v0.
6
.0"
review
:
extends
:
.auto-deploy
...
...
lib/gitlab/kubernetes/helm.rb
View file @
6b527478
...
...
@@ -3,7 +3,7 @@
module
Gitlab
module
Kubernetes
module
Helm
HELM_VERSION
=
'2.1
5
.1'
HELM_VERSION
=
'2.1
6
.1'
KUBECTL_VERSION
=
'1.13.12'
NAMESPACE
=
'gitlab-managed-apps'
SERVICE_ACCOUNT
=
'tiller'
...
...
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
View file @
6b527478
...
...
@@ -30,7 +30,7 @@ describe Gitlab::Kubernetes::Helm::Pod do
it
'generates the appropriate specifications for the container'
do
container
=
subject
.
generate
.
spec
.
containers
.
first
expect
(
container
.
name
).
to
eq
(
'helm'
)
expect
(
container
.
image
).
to
eq
(
'registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.1
5
.1-kube-1.13.12'
)
expect
(
container
.
image
).
to
eq
(
'registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.1
6
.1-kube-1.13.12'
)
expect
(
container
.
env
.
count
).
to
eq
(
3
)
expect
(
container
.
env
.
map
(
&
:name
)).
to
match_array
([
:HELM_VERSION
,
:TILLER_NAMESPACE
,
:COMMAND_SCRIPT
])
expect
(
container
.
command
).
to
match_array
([
"/bin/sh"
])
...
...
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