Merge pull request #213 from Starttoaster/master

Remove references to PodSecurityPolicy
cisco-open · Dec 20, 2023 · aff8650 · aff8650
2 parents ca7a7d9 + 02dec03
commit aff8650
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 20 deletions.
diff --git a/...lm/testdata/crds-and-templates/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/...lm/testdata/crds-and-templates/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -1499,8 +1499,6 @@ spec:
                               type: string
                           type: object
                       type: object
-                    podSecurityPolicyCreate:
-                      type: boolean
                     roleBasedAccessControlCreate:
                       type: boolean
                     securityContext:
@@ -2401,8 +2399,6 @@ spec:
                               type: string
                           type: object
                       type: object
-                    podSecurityPolicyCreate:
-                      type: boolean
                     roleBasedAccessControlCreate:
                       type: boolean
                     securityContext:

diff --git a/pkg/helm/testdata/crds-only/logging-operator/crds/logging.banzaicloud.io_loggings.yaml b/pkg/helm/testdata/crds-only/logging-operator/crds/logging.banzaicloud.io_loggings.yaml
@@ -1499,8 +1499,6 @@ spec:
                               type: string
                           type: object
                       type: object
-                    podSecurityPolicyCreate:
-                      type: boolean
                     roleBasedAccessControlCreate:
                       type: boolean
                     securityContext:
@@ -2401,8 +2399,6 @@ spec:
                               type: string
                           type: object
                       type: object
-                    podSecurityPolicyCreate:
-                      type: boolean
                     roleBasedAccessControlCreate:
                       type: boolean
                     securityContext:

diff --git a/pkg/resources/objectmodifiers.go b/pkg/resources/objectmodifiers.go
@@ -22,7 +22,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
-	policyv1beta1 "k8s.io/api/policy/v1beta1"
 	apiextensionsv1beta1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1"
 	"k8s.io/apimachinery/pkg/runtime"
 )
@@ -32,7 +31,6 @@ type ObjectModifierWithParentFunc func(o, p runtime.Object) (runtime.Object, err
 
 var DefaultModifiers = []ObjectModifierFunc{
 	ClearCRDStatusModifier,
-	ClusterScopeNamespaceFixModifier,
 	MutatingWebhookConfigurationModifier,
 	ValidatingWebhookConfigurationModifier,
 }
@@ -79,14 +77,6 @@ func ClearCRDStatusModifier(o runtime.Object) (runtime.Object, error) {
 	return o, nil
 }
 
-func ClusterScopeNamespaceFixModifier(o runtime.Object) (runtime.Object, error) {
-	if obj, ok := o.(*policyv1beta1.PodSecurityPolicy); ok {
-		obj.Namespace = ""
-	}
-
-	return o, nil
-}
-
 func MutatingWebhookConfigurationModifier(o runtime.Object) (runtime.Object, error) {
 	if obj, ok := o.(*admissionregistrationv1beta1.MutatingWebhookConfiguration); ok {
 		allScope := admissionregistrationv1beta1.AllScopes

diff --git a/pkg/utils/sort.go b/pkg/utils/sort.go
@@ -73,7 +73,6 @@ func InstallObjectOrder() func(o runtime.Object) int {
 		"Namespace",
 		"ResourceQuota",
 		"LimitRange",
-		"PodSecurityPolicy",
 		"PodDisruptionBudget",
 		"Secret",
 		"ConfigMap",
@@ -149,7 +148,6 @@ func UninstallObjectOrder() func(o runtime.Object) int {
 		"ConfigMap",
 		"Secret",
 		"PodDisruptionBudget",
-		"PodSecurityPolicy",
 		"LimitRange",
 		"ResourceQuota",
 		"Policy",