Skip to content

fix: add podSecurityLabelSync=true to openshift-gitops#1105

Merged
openshift-merge-bot[bot] merged 4 commits intoredhat-developer:masterfrom
nmirasch:GITOPS-9158_add_podSecurityLabelSync
Apr 9, 2026
Merged

fix: add podSecurityLabelSync=true to openshift-gitops#1105
openshift-merge-bot[bot] merged 4 commits intoredhat-developer:masterfrom
nmirasch:GITOPS-9158_add_podSecurityLabelSync

Conversation

@nmirasch
Copy link
Copy Markdown
Contributor

What type of PR is this?
/kind bug

What does this PR do / why we need it:
This PR delegate Pod Security Standards (PSS) labeling for OpenShift GitOps namespaces to the cluster.
The operator sets security.openshift.io/scc.podSecurityLabelSync=true on openshift-* namespaces and no longer applies hardcoded pod-security.kubernetes.io/* values itself.

Which issue(s) this PR fixes:

Fixes https://redhat.atlassian.net/browse/GITOPS-9158

Test acceptance criteria:

  • Unit Test
  • E2E Test

@openshift-ci openshift-ci bot requested review from Naveena-058 and jgwest March 23, 2026 18:53
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Mar 23, 2026

Hi @nmirasch. Thanks for your PR.

I'm waiting for a redhat-developer member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work.

Tip

We noticed you've done this a few times! Consider joining the org to skip this step and gain /lgtm and other bot rights. We recommend asking approvers on your previous PRs to sponsor you.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@svghadi
Copy link
Copy Markdown
Member

svghadi commented Mar 24, 2026

/ok-to-test

Copy link
Copy Markdown
Member

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

Thanks @nmirasch . The change looks good to me. I have left some suggestions in the test. Can you take a look?

@nmirasch nmirasch force-pushed the GITOPS-9158_add_podSecurityLabelSync branch from fcce172 to 7aaca66 Compare March 27, 2026 08:24
@nmirasch
Copy link
Copy Markdown
Contributor Author

@svghadi rebased!

@nmirasch nmirasch force-pushed the GITOPS-9158_add_podSecurityLabelSync branch from 7aaca66 to 4451f4c Compare March 27, 2026 09:14
@nmirasch
Copy link
Copy Markdown
Contributor Author

/retest

@nmirasch nmirasch force-pushed the GITOPS-9158_add_podSecurityLabelSync branch from 4451f4c to 682d002 Compare April 7, 2026 07:40
@nmirasch nmirasch force-pushed the GITOPS-9158_add_podSecurityLabelSync branch 3 times, most recently from aca76b4 to 259807b Compare April 7, 2026 16:17
nmirasch added 4 commits April 8, 2026 09:02
Signed-off-by: nmirasch <neus.miras@gmail.com>
Signed-off-by: nmirasch <neus.miras@gmail.com>
…esence

Signed-off-by: nmirasch <neus.miras@gmail.com>
Copy link
Copy Markdown
Member

@svghadi svghadi left a comment

Choose a reason for hiding this comment

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

/lgtm
/approve

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 8, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: svghadi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci bot added the approved label Apr 8, 2026
@nmirasch nmirasch force-pushed the GITOPS-9158_add_podSecurityLabelSync branch from 259807b to a22194c Compare April 8, 2026 10:39
@openshift-ci openshift-ci bot removed the lgtm label Apr 8, 2026
@nmirasch
Copy link
Copy Markdown
Contributor Author

nmirasch commented Apr 8, 2026

/retest

1 similar comment
@nmirasch
Copy link
Copy Markdown
Contributor Author

nmirasch commented Apr 8, 2026

/retest

@svghadi
Copy link
Copy Markdown
Member

svghadi commented Apr 9, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm label Apr 9, 2026
@openshift-merge-bot openshift-merge-bot bot merged commit 88b2301 into redhat-developer:master Apr 9, 2026
16 checks passed
@svghadi
Copy link
Copy Markdown
Member

svghadi commented Apr 9, 2026

/cherry-pick v1.20
/cherry-pick v1.19
/cherry-pick v1.18

@openshift-cherrypick-robot
Copy link
Copy Markdown

@svghadi: #1105 failed to apply on top of branch "v1.18":

Applying: fix: add podSecurityLabelSync=true to openshift-gitops
Using index info to reconstruct a base tree...
M	controllers/gitopsservice_controller.go
M	controllers/gitopsservice_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/gitopsservice_controller_test.go
Auto-merging controllers/gitopsservice_controller.go
CONFLICT (content): Merge conflict in controllers/gitopsservice_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix: add podSecurityLabelSync=true to openshift-gitops

Details

In response to this:

/cherry-pick v1.20
/cherry-pick v1.19
/cherry-pick v1.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@svghadi: #1105 failed to apply on top of branch "v1.19":

Applying: fix: add podSecurityLabelSync=true to openshift-gitops
Using index info to reconstruct a base tree...
M	controllers/gitopsservice_controller.go
M	controllers/gitopsservice_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/gitopsservice_controller_test.go
Auto-merging controllers/gitopsservice_controller.go
CONFLICT (content): Merge conflict in controllers/gitopsservice_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix: add podSecurityLabelSync=true to openshift-gitops

Details

In response to this:

/cherry-pick v1.20
/cherry-pick v1.19
/cherry-pick v1.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-cherrypick-robot
Copy link
Copy Markdown

@svghadi: #1105 failed to apply on top of branch "v1.20":

Applying: fix: add podSecurityLabelSync=true to openshift-gitops
Using index info to reconstruct a base tree...
M	controllers/gitopsservice_controller.go
M	controllers/gitopsservice_controller_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/gitopsservice_controller_test.go
Auto-merging controllers/gitopsservice_controller.go
CONFLICT (content): Merge conflict in controllers/gitopsservice_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 fix: add podSecurityLabelSync=true to openshift-gitops

Details

In response to this:

/cherry-pick v1.20
/cherry-pick v1.19
/cherry-pick v1.18

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

nmirasch added a commit to nmirasch/gitops-operator that referenced this pull request Apr 9, 2026
…per#1105)

* fix: add podSecurityLabelSync=true to openshift-gitops

Signed-off-by: nmirasch <neus.miras@gmail.com>

* e2e check at least one PSS label is set by Openshift

Signed-off-by: nmirasch <neus.miras@gmail.com>

* assert podSecurityLabelSync and audit=restricted for openshift-gitops ns

Signed-off-by: nmirasch <neus.miras@gmail.com>

* added podSecurityLabels validation for enforce, warn and *-version presence

Signed-off-by: nmirasch <neus.miras@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
(cherry picked from commit 88b2301)
nmirasch added a commit to nmirasch/gitops-operator that referenced this pull request Apr 9, 2026
…per#1105)

* fix: add podSecurityLabelSync=true to openshift-gitops

Signed-off-by: nmirasch <neus.miras@gmail.com>

* e2e check at least one PSS label is set by Openshift

Signed-off-by: nmirasch <neus.miras@gmail.com>

* assert podSecurityLabelSync and audit=restricted for openshift-gitops ns

Signed-off-by: nmirasch <neus.miras@gmail.com>

* added podSecurityLabels validation for enforce, warn and *-version presence

Signed-off-by: nmirasch <neus.miras@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
(cherry picked from commit 88b2301)
nmirasch added a commit to nmirasch/gitops-operator that referenced this pull request Apr 9, 2026
…per#1105)

* fix: add podSecurityLabelSync=true to openshift-gitops

Signed-off-by: nmirasch <neus.miras@gmail.com>

* e2e check at least one PSS label is set by Openshift

Signed-off-by: nmirasch <neus.miras@gmail.com>

* assert podSecurityLabelSync and audit=restricted for openshift-gitops ns

Signed-off-by: nmirasch <neus.miras@gmail.com>

* added podSecurityLabels validation for enforce, warn and *-version presence

Signed-off-by: nmirasch <neus.miras@gmail.com>

---------

Signed-off-by: nmirasch <neus.miras@gmail.com>
(cherry picked from commit 88b2301)
openshift-merge-bot bot pushed a commit that referenced this pull request Apr 10, 2026
* fix: add podSecurityLabelSync=true to openshift-gitops



* e2e check at least one PSS label is set by Openshift



* assert podSecurityLabelSync and audit=restricted for openshift-gitops ns



* added podSecurityLabels validation for enforce, warn and *-version presence



---------


(cherry picked from commit 88b2301)

Signed-off-by: nmirasch <neus.miras@gmail.com>
openshift-merge-bot bot pushed a commit that referenced this pull request Apr 10, 2026
* fix: add podSecurityLabelSync=true to openshift-gitops



* e2e check at least one PSS label is set by Openshift



* assert podSecurityLabelSync and audit=restricted for openshift-gitops ns



* added podSecurityLabels validation for enforce, warn and *-version presence



---------


(cherry picked from commit 88b2301)

Signed-off-by: nmirasch <neus.miras@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants