mirror of
https://github.com/rancher/rke.git
synced 2025-09-01 15:06:23 +00:00
removal of podsecuritypolicy code
This commit is contained in:
@@ -54,10 +54,6 @@ func (c *Cluster) ValidateCluster(ctx context.Context) error {
|
||||
return err
|
||||
}
|
||||
|
||||
// validate enabling Pod Security Policy
|
||||
if err := validatePodSecurityPolicy(c); err != nil {
|
||||
return err
|
||||
}
|
||||
// validate enabling Pod Security
|
||||
if err := validatePodSecurity(c); err != nil {
|
||||
return err
|
||||
@@ -682,24 +678,6 @@ func validateCRIDockerdOption(c *Cluster) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func validatePodSecurityPolicy(c *Cluster) error {
|
||||
parsedVersion, err := getClusterVersion(c.Version)
|
||||
if err != nil {
|
||||
logrus.Warnf("Failed to parse semver range for validating Pod Security Policy")
|
||||
return err
|
||||
}
|
||||
logrus.Debugf("Checking PodSecurityPolicy for cluster version [%s]", c.Version)
|
||||
if c.Services.KubeAPI.PodSecurityPolicy {
|
||||
if c.Authorization.Mode != services.RBACAuthorizationMode {
|
||||
return errors.New("PodSecurityPolicy can't be enabled with RBAC support disabled")
|
||||
}
|
||||
if parsedRangeAtLeast125(parsedVersion) {
|
||||
return errors.New("PodSecurityPolicy has been removed and can not be enabled since k8s v1.25")
|
||||
}
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func validatePodSecurity(c *Cluster) error {
|
||||
parsedVersion, err := getClusterVersion(c.Version)
|
||||
if err != nil {
|
||||
|
Reference in New Issue
Block a user