Skip to content

CNTRLPLANE-1544: manifests: Use restricted-v3 scc for the operator #645

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tchap wants to merge 1 commit into
base: main
Choose a base branch
from
Open

CNTRLPLANE-1544: manifests: Use restricted-v3 scc for the operator #645

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions manifests/10_deployment-hypershift.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,7 @@ spec:
volumeMounts:
- mountPath: /etc/guest-kubeconfig
name: guest-kubeconfig
hostUsers: false
securityContext:
runAsNonRoot: true
seccompProfile:
Expand Down
5 changes: 3 additions & 2 deletions manifests/10_deployment-ibm-cloud-managed.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
template:
metadata:
annotations:
openshift.io/required-scc: nonroot-v2
openshift.io/required-scc: restricted-v3
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
labels:
name: cluster-storage-operator
Expand Down Expand Up @@ -121,10 +121,11 @@ spec:
volumeMounts:
- mountPath: /var/run/secrets/serving-cert
name: cluster-storage-operator-serving-cert
hostUsers: false
priorityClassName: system-cluster-critical
securityContext:
runAsNonRoot: true
runAsUser: 11411
runAsUser: 1000
seccompProfile:
type: RuntimeDefault
serviceAccountName: cluster-storage-operator
Expand Down
11 changes: 6 additions & 5 deletions manifests/10_deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ spec:
metadata:
annotations:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
openshift.io/required-scc: nonroot-v2
openshift.io/required-scc: restricted-v3
labels:
name: cluster-storage-operator
openshift.storage.network-policy.dns: allow
Expand All @@ -37,14 +37,15 @@ spec:
operator: "Exists"
effect: "NoExecute"
tolerationSeconds: 120 # Evict pods within 2 mins.
hostUsers: false
priorityClassName: system-cluster-critical
serviceAccountName: cluster-storage-operator
securityContext:
# TODO: remove cluster-admin from the operator
runAsNonRoot: true
# Force a specific UID, just in case this Pod matches a custom SCC with "runAsUser: type: runAsNonRoot".
# The UID value was chosen by a fair `echo $RANDOM` call.
# TODO: remove cluster-admin from the operator, then a specific UID won't be needed.
runAsUser: 11411
# runAsUser must be set, otherwise make update fails.
# This is the default value set by restricted-v3 scc.
runAsUser: 1000
seccompProfile:
type: RuntimeDefault
containers:
Expand Down