Fix support for k8s 1.25 #406
Merged
Conversation
This file contains 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
CronJob is promoted to batch/v1 now. Signed-off-by: Ivan Kolodiazhny <ikolodiazhny@nvidia.com>
e0ne
changed the title
e0ne
force-pushed
the
whereabouts-k8s-1.25
branch
from
56fa81c
to
bc51c81
Compare
| @@ -102,6 +104,13 @@ func (s *statePodSecurityPolicy) Sync(customResource interface{}, infoCatalog In | |||
| // Get a map of source kinds that should be watched for the state keyed by the source kind name | |||
| func (s *statePodSecurityPolicy) GetWatchSources() map[string]*source.Kind { | |||
| wr := make(map[string]*source.Kind) | |||
| psp := &policyv1beta1.PodSecurityPolicyList{} | |||
| err := s.client.List(context.TODO(), psp) | |||
There was a problem hiding this comment.
Should we check for error type for NotMatch?
"k8s.io/apimachinery/pkg/api/meta"
meta.IsNoMatchError(err)
There was a problem hiding this comment.
Let's do it! I checked "k8s.io/apimachinery/pkg/api/errors" and it doesn't contain required logic. Thanks for the pointing me on it
| err := s.client.List(context.TODO(), psp) | ||
| if err != nil { | ||
| // We assume it's k8s v1.25 or newer so PodSecurityPolicy is not supported and no need to reconcile them | ||
| log.V(consts.LogLevelInfo).Info("pod security policy is not available") |
There was a problem hiding this comment.
Do we need to add an error message if helm chart is deployed with PSP enabled on k8s 1.25+?
There was a problem hiding this comment.
IMO, it should be done on CRD validation stage in an admission controller which isn't implemented yet
There was a problem hiding this comment.
Fair point.
I guess to explicitly deprecate PSP in NicClusterPolicy we also need an admission controller?
Signed-off-by: Ivan Kolodiazhny <ikolodiazhny@nvidia.com>
e0ne
force-pushed
the
whereabouts-k8s-1.25
branch
from
bc51c81
to
622bf73
Compare
ykulazhenkov
approved these changes
Sep 22, 2022
almaslennikov
approved these changes
Sep 22, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.