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
7ba9e413
Commit
7ba9e413
authored
Apr 05, 2019
by
GitLab Bot
Browse files
Options
Browse Files
Download
Plain Diff
Automatic merge of gitlab-org/gitlab-ce master
parents
09707c8d
b6cf4ec1
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
4 deletions
+14
-4
GITALY_SERVER_VERSION
GITALY_SERVER_VERSION
+1
-1
changelogs/unreleased/bump_kubernetes_1_11_9.yml
changelogs/unreleased/bump_kubernetes_1_11_9.yml
+5
-0
changelogs/unreleased/gitaly-version-v1.32.0.yml
changelogs/unreleased/gitaly-version-v1.32.0.yml
+5
-0
lib/gitlab/kubernetes/helm.rb
lib/gitlab/kubernetes/helm.rb
+2
-2
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
+1
-1
No files found.
GITALY_SERVER_VERSION
View file @
7ba9e413
1.3
1
.0
1.3
2
.0
changelogs/unreleased/bump_kubernetes_1_11_9.yml
0 → 100644
View file @
7ba9e413
---
title
:
Bump Helm and kubectl used in Kubernetes integration to 2.13.1 and 1.11.9 respectively
merge_request
:
26991
author
:
type
:
other
changelogs/unreleased/gitaly-version-v1.32.0.yml
0 → 100644
View file @
7ba9e413
---
title
:
Upgrade to Gitaly v1.32.0
merge_request
:
26989
author
:
type
:
changed
lib/gitlab/kubernetes/helm.rb
View file @
7ba9e413
...
...
@@ -3,8 +3,8 @@
module
Gitlab
module
Kubernetes
module
Helm
HELM_VERSION
=
'2.1
2.3
'
.
freeze
KUBECTL_VERSION
=
'1.11.
7
'
.
freeze
HELM_VERSION
=
'2.1
3.1
'
.
freeze
KUBECTL_VERSION
=
'1.11.
9
'
.
freeze
NAMESPACE
=
'gitlab-managed-apps'
.
freeze
SERVICE_ACCOUNT
=
'tiller'
.
freeze
CLUSTER_ROLE_BINDING
=
'tiller-admin'
.
freeze
...
...
spec/lib/gitlab/kubernetes/helm/pod_spec.rb
View file @
7ba9e413
...
...
@@ -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
2.3-kube-1.11.7
'
)
expect
(
container
.
image
).
to
eq
(
'registry.gitlab.com/gitlab-org/cluster-integration/helm-install-image/releases/2.1
3.1-kube-1.11.9
'
)
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