Merged
Conversation
|
Images are ready for the commit at 9a264fe. To use with deploy scripts, first |
vikin91
reviewed
Feb 2, 2023
Contributor
vikin91
left a comment
There was a problem hiding this comment.
The change looks good, but I am afraid that we will need to provide manual upgrade steps if this is used by customers.
vikin91
approved these changes
Feb 2, 2023
Contributor
vikin91
left a comment
There was a problem hiding this comment.
Updating based on the answer from the standup. Thanks!
gavin-stackrox
pushed a commit
that referenced
this pull request
Feb 10, 2023
1 task
gavin-stackrox
pushed a commit
that referenced
this pull request
Feb 11, 2023
gavin-stackrox
pushed a commit
that referenced
this pull request
Feb 11, 2023
1 task
gavin-stackrox
pushed a commit
that referenced
this pull request
Feb 14, 2023
gavin-stackrox
pushed a commit
that referenced
this pull request
Feb 14, 2023
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Kubernetes 1.25 deprecated PSP (PodSecurityPolicies) altogether.
We had previously introduced switches to decide whether PSPs are generated for our deployments (see #3230 and #1747).
We did not introduce this change to our Monitoring setup, which this PR fixes.
I introduced a new env var,
MONITORING_ENABLE_PSP, which decides whether PSPs are generated or not.The env var defaults to
falseand needs to be explicitly enabled (e.g. for k8s < 1.25).The ClusterRole was kept, as it is needed for Prometheus discovery features to work (more information). I only removed the PSP-relevant parts.
Checklist
Unit test and regression tests addedEvaluated and added CHANGELOG entry if requiredDetermined and documented upgrade stepsDocumented user facing changes (create PR based on openshift/openshift-docs and merge into rhacs-docs)Most of the PR items don't apply as the monitoring charts are internal eng use only.
Testing Performed
Tested on Colima 1.25 and 1.24 locally, as well as an OpenShift 4.12 cluster.
In all cases, I deployed with and without generated PSPs and checked function of Prometheus.