Skip to content

Commit ba0a892

Browse files
committed
helm: Enable user namespaces for deployment
Also switch to hostmount-anyuid-v2 SCC instead of privileged.
1 parent bf97f12 commit ba0a892

9 files changed

+22
-22
lines changed

helm/olmv1/templates/deployment-olmv1-system-catalogd-controller-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ spec:
2828
{{- include "olmv1.annotations" . | nindent 8 }}
2929
{{- if .Values.options.openshift.enabled }}
3030
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
31-
openshift.io/required-scc: privileged
31+
openshift.io/required-scc: hostmount-anyuid-v2
3232
{{- end }}
3333
labels:
3434
app.kubernetes.io/name: catalogd

helm/olmv1/templates/deployment-olmv1-system-operator-controller-controller-manager.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ spec:
2727
{{- include "olmv1.annotations" . | nindent 8 }}
2828
{{- if .Values.options.openshift.enabled }}
2929
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
30-
openshift.io/required-scc: privileged
30+
openshift.io/required-scc: hostmount-anyuid-v2
3131
{{- end }}
3232
labels:
3333
app.kubernetes.io/name: operator-controller

helm/olmv1/templates/rbac/clusterrole-catalogd-manager-role.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ rules:
4141
resources:
4242
- securitycontextconstraints
4343
resourceNames:
44-
- privileged
44+
- hostmount-anyuid-v2
4545
verbs:
4646
- use
4747
{{- end }}

helm/olmv1/templates/rbac/clusterrole-operator-controller-manager-role.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ rules:
6868
resources:
6969
- securitycontextconstraints
7070
resourceNames:
71-
- privileged
71+
- hostmount-anyuid-v2
7272
verbs:
7373
- use
7474
{{- end }}

helm/olmv1/values.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,10 @@ deployments:
6666
nodeSelector:
6767
kubernetes.io/os: linux
6868
node-role.kubernetes.io/control-plane: ""
69+
hostUsers: false
6970
securityContext:
7071
runAsNonRoot: true
71-
seccompProfile:
72-
type: RuntimeDefault
72+
runAsUser: 1000
7373
terminationGracePeriodSeconds: 10
7474
tolerations:
7575
- effect: NoSchedule

manifests/experimental-e2e.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2125,13 +2125,13 @@ spec:
21252125
operator: In
21262126
values:
21272127
- linux
2128+
hostUsers: false
21282129
nodeSelector:
21292130
kubernetes.io/os: linux
21302131
node-role.kubernetes.io/control-plane: ""
21312132
securityContext:
21322133
runAsNonRoot: true
2133-
seccompProfile:
2134-
type: RuntimeDefault
2134+
runAsUser: 1000
21352135
terminationGracePeriodSeconds: 10
21362136
tolerations:
21372137
- effect: NoSchedule
@@ -2284,13 +2284,13 @@ spec:
22842284
operator: In
22852285
values:
22862286
- linux
2287+
hostUsers: false
22872288
nodeSelector:
22882289
kubernetes.io/os: linux
22892290
node-role.kubernetes.io/control-plane: ""
22902291
securityContext:
22912292
runAsNonRoot: true
2292-
seccompProfile:
2293-
type: RuntimeDefault
2293+
runAsUser: 1000
22942294
terminationGracePeriodSeconds: 10
22952295
tolerations:
22962296
- effect: NoSchedule

manifests/experimental.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2038,13 +2038,13 @@ spec:
20382038
operator: In
20392039
values:
20402040
- linux
2041+
hostUsers: false
20412042
nodeSelector:
20422043
kubernetes.io/os: linux
20432044
node-role.kubernetes.io/control-plane: ""
20442045
securityContext:
20452046
runAsNonRoot: true
2046-
seccompProfile:
2047-
type: RuntimeDefault
2047+
runAsUser: 1000
20482048
terminationGracePeriodSeconds: 10
20492049
tolerations:
20502050
- effect: NoSchedule
@@ -2183,13 +2183,13 @@ spec:
21832183
operator: In
21842184
values:
21852185
- linux
2186+
hostUsers: false
21862187
nodeSelector:
21872188
kubernetes.io/os: linux
21882189
node-role.kubernetes.io/control-plane: ""
21892190
securityContext:
21902191
runAsNonRoot: true
2191-
seccompProfile:
2192-
type: RuntimeDefault
2192+
runAsUser: 1000
21932193
terminationGracePeriodSeconds: 10
21942194
tolerations:
21952195
- effect: NoSchedule

manifests/standard-e2e.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1876,13 +1876,13 @@ spec:
18761876
operator: In
18771877
values:
18781878
- linux
1879+
hostUsers: false
18791880
nodeSelector:
18801881
kubernetes.io/os: linux
18811882
node-role.kubernetes.io/control-plane: ""
18821883
securityContext:
18831884
runAsNonRoot: true
1884-
seccompProfile:
1885-
type: RuntimeDefault
1885+
runAsUser: 1000
18861886
terminationGracePeriodSeconds: 10
18871887
tolerations:
18881888
- effect: NoSchedule
@@ -2029,13 +2029,13 @@ spec:
20292029
operator: In
20302030
values:
20312031
- linux
2032+
hostUsers: false
20322033
nodeSelector:
20332034
kubernetes.io/os: linux
20342035
node-role.kubernetes.io/control-plane: ""
20352036
securityContext:
20362037
runAsNonRoot: true
2037-
seccompProfile:
2038-
type: RuntimeDefault
2038+
runAsUser: 1000
20392039
terminationGracePeriodSeconds: 10
20402040
tolerations:
20412041
- effect: NoSchedule

manifests/standard.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1789,13 +1789,13 @@ spec:
17891789
operator: In
17901790
values:
17911791
- linux
1792+
hostUsers: false
17921793
nodeSelector:
17931794
kubernetes.io/os: linux
17941795
node-role.kubernetes.io/control-plane: ""
17951796
securityContext:
17961797
runAsNonRoot: true
1797-
seccompProfile:
1798-
type: RuntimeDefault
1798+
runAsUser: 1000
17991799
terminationGracePeriodSeconds: 10
18001800
tolerations:
18011801
- effect: NoSchedule
@@ -1928,13 +1928,13 @@ spec:
19281928
operator: In
19291929
values:
19301930
- linux
1931+
hostUsers: false
19311932
nodeSelector:
19321933
kubernetes.io/os: linux
19331934
node-role.kubernetes.io/control-plane: ""
19341935
securityContext:
19351936
runAsNonRoot: true
1936-
seccompProfile:
1937-
type: RuntimeDefault
1937+
runAsUser: 1000
19381938
terminationGracePeriodSeconds: 10
19391939
tolerations:
19401940
- effect: NoSchedule

0 commit comments

Comments
 (0)