Skip to content

Commit e822a35

Browse files
committed
Use user namespaces for all deployments
This goes for both the operator and the operands. All deployments now contain hostUsers: false. The SC user and group IDs are set to 1000.
1 parent da1e14c commit e822a35

File tree

3 files changed

+15
-7
lines changed

3 files changed

+15
-7
lines changed

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,16 @@ spec:
3333
name: openshift-controller-manager
3434
annotations:
3535
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
36-
openshift.io/required-scc: restricted-v2
36+
openshift.io/required-scc: restricted-v3
3737
labels:
3838
app: openshift-controller-manager-a
3939
controller-manager: "true"
4040
spec:
41+
hostUsers: false
4142
securityContext:
42-
runAsNonRoot: true
43+
runAsUser: 1000
44+
runAsGroup: 1000
45+
fsGroup: 1000
4346
seccompProfile:
4447
type: RuntimeDefault
4548
priorityClassName: system-node-critical

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,16 @@ spec:
2323
name: route-controller-manager
2424
annotations:
2525
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
26-
openshift.io/required-scc: restricted-v2
26+
openshift.io/required-scc: restricted-v3
2727
labels:
2828
app: route-controller-manager
2929
route-controller-manager: "true"
3030
spec:
31+
hostUsers: false
3132
securityContext:
32-
runAsNonRoot: true
33+
runAsUser: 1000
34+
runAsGroup: 1000
35+
fsGroup: 1000
3336
seccompProfile:
3437
type: RuntimeDefault
3538
priorityClassName: system-node-critical

manifests/09_deployment.yaml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +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:
26+
hostUsers: false
2627
securityContext:
27-
runAsNonRoot: true
28-
runAsUser: 65534
28+
runAsUser: 1000
29+
runAsGroup: 1000
30+
fsGroup: 1000
2931
seccompProfile:
3032
type: RuntimeDefault
3133
serviceAccountName: openshift-controller-manager-operator

0 commit comments

Comments
 (0)