Skip to content

AUTH-482: Add required-scc annotation to router #4656

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

Merged
merged 2 commits into from
Mar 14, 2025
Merged

AUTH-482: Add required-scc annotation to router #4656

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
80581ac
Add the required-scc annotation to the default router (set to restric…
jacobsee Mar 8, 2025
9ac0482
Add restricted SCC to the router deployment in the rebase script.
jacobsee Mar 14, 2025
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 assets/components/openshift-router/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ spec:
metadata:
annotations:
target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
openshift.io/required-scc: restricted
Copy link
Member

@pmtk pmtk Mar 12, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you tell why it isn't included in the upstream file (https://github.com/openshift/cluster-ingress-operator/blob/master/pkg/manifests/assets/router/deployment.yaml#L10-L11)? It is set during runtime by the operator?

This file is copied when microshift updates its dependencies, so this change might be overwritten in few days if we merge this. If this is runtime addition, then we also need a change in rebase.sh script (see this).

I believe this should do the job:

yq '.spec.template.metadata.annotations += {"openshift.io/required-scc": "restricted"}' "${REPOROOT}"/assets/components/openshift-router/deployment.yaml

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the operator is setting it dynamically based on whether it needs host networking or not here: https://github.com/openshift/cluster-ingress-operator/blob/7dc12cf28557f8c80460435649cfc393761e0285/pkg/operator/controller/ingress/deployment.go#L1212-L1215

I don't see where Microshift has the same host networking config, so just setting it to restricted here.

I was not aware of the rebase script - made the change there. Thanks!

labels:
ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
spec:
Expand Down