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
3557a32b
Commit
3557a32b
authored
Feb 24, 2020
by
Kamil Trzciński
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'update-helm-to-2-16-3' into 'master'
Update helm to 2.16.3 See merge request gitlab-org/gitlab!25728
parents
750b16ff
5c9fa8df
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
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.
lib/gitlab/kubernetes/helm.rb
View file @
3557a32b
...
...
@@ -3,7 +3,7 @@
module
Gitlab
module
Kubernetes
module
Helm
HELM_VERSION
=
'2.16.
1
'
HELM_VERSION
=
'2.16.
3
'
KUBECTL_VERSION
=
'1.13.12'
NAMESPACE
=
'gitlab-managed-apps'
NAMESPACE_LABELS
=
{
'app.gitlab.com/managed_by'
=>
:gitlab
}.
freeze
...
...
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
View file @
3557a32b
...
...
@@ -32,7 +32,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.16.
1
-kube-1.13.12'
)
expect
(
container
.
image
).
to
eq
(
'registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.16.
3
-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