Skip to content

Commit b71fd0c

Browse files
committed
update rebase patch
1 parent ba1f75b commit b71fd0c

File tree

1 file changed

+29
-22
lines changed

1 file changed

+29
-22
lines changed

scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch

Lines changed: 29 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -70,30 +70,37 @@ index 545e1a04..39b266a0 100644
7070
- i.OpenshiftConfigInformers.Start(stopCh)
7171
}
7272
diff --git a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go
73-
index 2427e502d..a75cdfdde 100644
73+
index e92ab9e9f..01bb74419 100644
7474
--- a/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go
7575
+++ b/deps/github.com/openshift/kubernetes/openshift-kube-apiserver/admission/admissionenablement/register.go
76-
@@ -13,7 +13,6 @@ import (
77-
"github.com/openshift/apiserver-library-go/pkg/securitycontextconstraints/sccadmission"
78-
authorizationrestrictusers "k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers"
79-
quotaclusterresourceoverride "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/clusterresourceoverride"
80-
- "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managednode"
81-
"k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/managementcpusoverride"
82-
quotarunonceduration "k8s.io/kubernetes/openshift-kube-apiserver/admission/autoscaling/runonceduration"
83-
"k8s.io/kubernetes/openshift-kube-apiserver/admission/customresourcevalidation/customresourcevalidationregistration"
84-
@@ -31,7 +31,6 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) {
85-
imagepolicy.Register(plugins)
86-
ingressadmission.Register(plugins)
87-
managementcpusoverride.Register(plugins)
88-
- managednode.Register(plugins)
89-
mixedcpus.Register(plugins)
90-
projectnodeenv.Register(plugins)
91-
quotaclusterresourceoverride.Register(plugins)
92-
@@ -74,7 +73,6 @@ var (
76+
@@ -23,6 +23,7 @@ import (
77+
projectnodeenv "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv"
78+
schedulerpodnodeconstraints "k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/podnodeconstraints"
79+
"k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/csiinlinevolumesecurity"
80+
+ "k8s.io/kubernetes/openshift-kube-apiserver/admission/storage/performantsecuritypolicy"
81+
)
82+
83+
func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) {
84+
@@ -42,6 +43,7 @@ func RegisterOpenshiftKubeAdmissionPlugins(plugins *admission.Plugins) {
85+
externalipranger.RegisterExternalIP(plugins)
86+
restrictedendpoints.RegisterRestrictedEndpoints(plugins)
87+
csiinlinevolumesecurity.Register(plugins)
88+
+ performantsecuritypolicy.Register(plugins)
89+
}
90+
91+
var (
92+
@@ -71,9 +73,11 @@ var (
93+
"security.openshift.io/SecurityContextConstraint",
94+
"security.openshift.io/SCCExecRestrictions",
9395
"route.openshift.io/IngressAdmission",
94-
hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment"
95-
csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity"
96-
- managednode.PluginName, // "autoscaling.openshift.io/ManagedNode"
97-
mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs"
96+
- hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment"
97+
- csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity"
98+
- mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs"
99+
+ hostassignment.PluginName, // "route.openshift.io/RouteHostAssignment"
100+
+ csiinlinevolumesecurity.PluginName, // "storage.openshift.io/CSIInlineVolumeSecurity"
101+
+ managednode.PluginName, // "autoscaling.openshift.io/ManagedNode"
102+
+ mixedcpus.PluginName, // "autoscaling.openshift.io/MixedCPUs"
103+
+ performantsecuritypolicy.PluginName, // "storage.openshift.io/PerformantSecurityPolicy"
98104
}
99105

106+
// openshiftAdmissionPluginsForKubeAfterResourceQuota are the plugins to add after ResourceQuota plugin

0 commit comments

Comments
 (0)