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
042b4ac6
Commit
042b4ac6
authored
Jul 02, 2020
by
Joao Cunha
Committed by
João Cunha
Aug 03, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Updates Ingress version
parent
8eeba6ab
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
app/models/clusters/applications/ingress.rb
app/models/clusters/applications/ingress.rb
+1
-1
changelogs/unreleased/jcunha-update-ingress-version.yml
changelogs/unreleased/jcunha-update-ingress-version.yml
+5
-0
spec/models/clusters/applications/ingress_spec.rb
spec/models/clusters/applications/ingress_spec.rb
+2
-2
No files found.
app/models/clusters/applications/ingress.rb
View file @
042b4ac6
...
...
@@ -3,7 +3,7 @@
module
Clusters
module
Applications
class
Ingress
<
ApplicationRecord
VERSION
=
'1.
29.7
'
VERSION
=
'1.
40.2
'
INGRESS_CONTAINER_NAME
=
'nginx-ingress-controller'
MODSECURITY_LOG_CONTAINER_NAME
=
'modsecurity-log'
MODSECURITY_MODE_LOGGING
=
"DetectionOnly"
...
...
changelogs/unreleased/jcunha-update-ingress-version.yml
0 → 100644
View file @
042b4ac6
---
title
:
Updates GitLab managed app Ingress version to 1.40.2
merge_request
:
35924
author
:
type
:
changed
spec/models/clusters/applications/ingress_spec.rb
View file @
042b4ac6
...
...
@@ -136,7 +136,7 @@ RSpec.describe Clusters::Applications::Ingress do
it
'is initialized with ingress arguments'
do
expect
(
subject
.
name
).
to
eq
(
'ingress'
)
expect
(
subject
.
chart
).
to
eq
(
'stable/nginx-ingress'
)
expect
(
subject
.
version
).
to
eq
(
'1.
29.7
'
)
expect
(
subject
.
version
).
to
eq
(
'1.
40.2
'
)
expect
(
subject
).
to
be_rbac
expect
(
subject
.
files
).
to
eq
(
ingress
.
files
)
end
...
...
@@ -153,7 +153,7 @@ RSpec.describe Clusters::Applications::Ingress do
let
(
:ingress
)
{
create
(
:clusters_applications_ingress
,
:errored
,
version:
'nginx'
)
}
it
'is initialized with the locked version'
do
expect
(
subject
.
version
).
to
eq
(
'1.
29.7
'
)
expect
(
subject
.
version
).
to
eq
(
'1.
40.2
'
)
end
end
end
...
...
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