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
400ea587
Commit
400ea587
authored
Apr 20, 2020
by
Alan Paruszewski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Change args on modsecurity-log container to ignore file inaccessiblity
parent
a256e32a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
app/models/clusters/applications/ingress.rb
app/models/clusters/applications/ingress.rb
+1
-1
spec/models/clusters/applications/ingress_spec.rb
spec/models/clusters/applications/ingress_spec.rb
+6
-0
No files found.
app/models/clusters/applications/ingress.rb
View file @
400ea587
...
@@ -98,7 +98,7 @@ module Clusters
...
@@ -98,7 +98,7 @@ module Clusters
"args"
=>
[
"args"
=>
[
"/bin/sh"
,
"/bin/sh"
,
"-c"
,
"-c"
,
"tail -
f
/var/log/modsec/audit.log"
"tail -
F
/var/log/modsec/audit.log"
],
],
"volumeMounts"
=>
[
"volumeMounts"
=>
[
{
{
...
...
spec/models/clusters/applications/ingress_spec.rb
View file @
400ea587
...
@@ -220,6 +220,12 @@ describe Clusters::Applications::Ingress do
...
@@ -220,6 +220,12 @@ describe Clusters::Applications::Ingress do
expect
(
subject
.
values
).
to
include
(
'extraContainers'
)
expect
(
subject
.
values
).
to
include
(
'extraContainers'
)
end
end
it
'executes command to tail modsecurity logs with -F option'
do
args
=
YAML
.
safe_load
(
subject
.
values
).
dig
(
'controller'
,
'extraContainers'
,
0
,
'args'
)
expect
(
args
).
to
eq
([
'/bin/sh'
,
'-c'
,
'tail -F /var/log/modsec/audit.log'
])
end
it
'includes livenessProbe for modsecurity sidecar container'
do
it
'includes livenessProbe for modsecurity sidecar container'
do
probe_config
=
YAML
.
safe_load
(
subject
.
values
).
dig
(
'controller'
,
'extraContainers'
,
0
,
'livenessProbe'
)
probe_config
=
YAML
.
safe_load
(
subject
.
values
).
dig
(
'controller'
,
'extraContainers'
,
0
,
'livenessProbe'
)
...
...
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