Skip to content

Commit fc3aaa5

Browse files
Enforce PSA for restricted instead of baseline
For the last two years, we've defaulted to baseline enforcement. At this point, I expect everyone to use catalog binaries that can handle restricted enforcement
1 parent 8723097 commit fc3aaa5

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

deploy/chart/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ rbacApiVersion: rbac.authorization.k8s.io
22
namespace: operator-lifecycle-manager
33
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
44
namespace_psa:
5-
enforceLevel: baseline
5+
enforceLevel: restricted
66
enforceVersion: latest
77
auditLevel: restricted
88
auditVersion: latest
@@ -12,7 +12,7 @@ catalog_namespace: operator-lifecycle-manager
1212
operator_namespace: operators
1313
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
1414
operator_namespace_psa:
15-
enforceLevel: baseline
15+
enforceLevel: restricted
1616
enforceVersion: latest
1717
minKubeVersion: 1.11.0
1818
writeStatusName: '""'

deploy/upstream/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ catalog_namespace: olm
99
operator_namespace: operators
1010
# see https://kubernetes.io/docs/concepts/security/pod-security-admission/ for more details
1111
operator_namespace_psa:
12-
enforceLevel: baseline
12+
enforceLevel: restricted
1313
enforceVersion: latest
1414
imagestream: false
1515
writeStatusName: '""'

test/e2e/catalog_e2e_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1672,7 +1672,7 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
16721672
})
16731673
})
16741674
})
1675-
When("The namespace is labled as Pod Security Admission policy enforce:baseline", func() {
1675+
When("The namespace is labled as Pod Security Admission policy enforce:restricted", func() {
16761676
BeforeEach(func() {
16771677
var err error
16781678
testNS := &corev1.Namespace{}
@@ -1685,7 +1685,7 @@ var _ = Describe("Starting CatalogSource e2e tests", Label("CatalogSource"), fun
16851685
}).Should(BeNil())
16861686

16871687
testNS.ObjectMeta.Labels = map[string]string{
1688-
"pod-security.kubernetes.io/enforce": "baseline",
1688+
"pod-security.kubernetes.io/enforce": "restricted",
16891689
"pod-security.kubernetes.io/enforce-version": "latest",
16901690
}
16911691

0 commit comments

Comments
 (0)