Skip to content

Commit 75f30cd

Browse files
Merge pull request #834 from jsafrane/add-selinux-controller
STOR-2267: Run SELinux warning controller
2 parents 84e0201 + 03b7cf2 commit 75f30cd

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

Diff for: bindata/assets/config/defaultconfig.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ extendedArguments:
2626
- "-ttl" # TODO: this is excluded in kube-core, but not in #21092
2727
- "-bootstrapsigner"
2828
- "-tokencleaner"
29+
# Most upstream clusters don't care about SELinux, therefore this controller is opt-in. OCP cares.
30+
# Owner: OCP storage team, @jsafrane.
31+
- "selinux-warning-controller"
2932
cloud-provider:
3033
- "external"
3134
cluster-signing-duration:

Diff for: pkg/cmd/render/render_test.go

+3
Original file line numberDiff line numberDiff line change
@@ -189,6 +189,7 @@ func TestRenderCommand(t *testing.T) {
189189
"--controllers=-bootstrapsigner",
190190
"--controllers=-tokencleaner",
191191
"--controllers=-ttl",
192+
"--controllers=selinux-warning-controller",
192193
"--enable-dynamic-provisioning=true",
193194
"--feature-gates=Bar=false",
194195
"--feature-gates=Foo=true",
@@ -268,6 +269,7 @@ func TestRenderCommand(t *testing.T) {
268269
"--controllers=-bootstrapsigner",
269270
"--controllers=-tokencleaner",
270271
"--controllers=-ttl",
272+
"--controllers=selinux-warning-controller",
271273
"--enable-dynamic-provisioning=true",
272274
"--feature-gates=Bar=false",
273275
"--feature-gates=Foo=true",
@@ -333,6 +335,7 @@ func TestRenderCommand(t *testing.T) {
333335
"--controllers=-bootstrapsigner",
334336
"--controllers=-tokencleaner",
335337
"--controllers=-ttl",
338+
"--controllers=selinux-warning-controller",
336339
"--enable-dynamic-provisioning=true",
337340
"--feature-gates=AwesomeNewFeature=true",
338341
"--feature-gates=BadFailingFeature=false",

0 commit comments

Comments
 (0)