Skip to content

Commit 72cf759

Browse files
committed
Use restricted-v3 SCC profile
1 parent 6ec0389 commit 72cf759

File tree

5 files changed

+3
-30
lines changed

5 files changed

+3
-30
lines changed

bindata/assets/openshift-controller-manager/deploy.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,19 +33,16 @@ spec:
3333
name: openshift-controller-manager
3434
annotations:
3535
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
36-
openshift.io/required-scc: nonroot-v2
36+
openshift.io/required-scc: restricted-v3
3737
labels:
3838
app: openshift-controller-manager-a
3939
controller-manager: "true"
4040
spec:
4141
hostUsers: false
4242
securityContext:
43-
runAsNonRoot: true
4443
runAsUser: 1000
4544
runAsGroup: 1000
4645
fsGroup: 1000
47-
seccompProfile:
48-
type: RuntimeDefault
4946
priorityClassName: system-node-critical
5047
serviceAccountName: openshift-controller-manager-sa
5148
containers:

bindata/assets/openshift-controller-manager/informer-clusterrole.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,3 @@ rules:
2121
- create
2222
- patch
2323
- update
24-
# Allow for nonroot-v2 SCC
25-
- apiGroups:
26-
- security.openshift.io
27-
resources:
28-
- securitycontextconstraints
29-
resourceNames:
30-
- nonroot-v2
31-
verbs:
32-
- use

bindata/assets/openshift-controller-manager/route-controller-manager-clusterrole.yaml

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,3 @@ rules:
4949
- get
5050
- list
5151
- watch
52-
# Allow for nonroot-v2 SCC
53-
- apiGroups:
54-
- security.openshift.io
55-
resources:
56-
- securitycontextconstraints
57-
resourceNames:
58-
- nonroot-v2
59-
verbs:
60-
- use

bindata/assets/openshift-controller-manager/route-controller-manager-deploy.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,16 @@ spec:
2323
name: route-controller-manager
2424
annotations:
2525
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
26-
openshift.io/required-scc: nonroot-v2
26+
openshift.io/required-scc: restricted-v3
2727
labels:
2828
app: route-controller-manager
2929
route-controller-manager: "true"
3030
spec:
3131
hostUsers: false
3232
securityContext:
33-
runAsNonRoot: true
3433
runAsUser: 1000
3534
runAsGroup: 1000
3635
fsGroup: 1000
37-
seccompProfile:
38-
type: RuntimeDefault
3936
priorityClassName: system-node-critical
4037
serviceAccountName: route-controller-manager-sa
4138
containers:

manifests/09_deployment.yaml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,18 +19,15 @@ spec:
1919
name: openshift-controller-manager-operator
2020
annotations:
2121
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
22-
openshift.io/required-scc: nonroot-v2
22+
openshift.io/required-scc: restricted-v3
2323
labels:
2424
app: openshift-controller-manager-operator
2525
spec:
2626
hostUsers: false
2727
securityContext:
28-
runAsNonRoot: true
2928
runAsUser: 1000
3029
runAsGroup: 1000
3130
fsGroup: 1000
32-
seccompProfile:
33-
type: RuntimeDefault
3431
serviceAccountName: openshift-controller-manager-operator
3532
containers:
3633
- name: openshift-controller-manager-operator

0 commit comments

Comments
 (0)