UPSTREAM: <carry>: hardcoded restmapper with a few entries to reboots…

…trap SDN when SDN is down UPSTREAM: <carry>: use hardcoded rest mapper from library-go OpenShift-Rebase-Source: a00f75d
openshift · Jul 1, 2024 · 365d5d0 · 365d5d0
1 parent b2c064e
commit 365d5d0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/admission.go b/staging/src/k8s.io/apiserver/pkg/server/options/admission.go
@@ -153,7 +153,7 @@ func (a *AdmissionOptions) ApplyTo(
 	discoveryClient := cacheddiscovery.NewMemCacheClient(kubeClient.Discovery())
 	discoveryRESTMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
 	genericInitializer := initializer.New(kubeClient, dynamicClient, informers, c.Authorization.Authorizer, features,
-		c.DrainedNotify(), discoveryRESTMapper)
+		c.DrainedNotify(), NewAdmissionRESTMapper(discoveryRESTMapper))
 	initializersChain := admission.PluginInitializers{genericInitializer}
 	initializersChain = append(initializersChain, pluginInitializers...)
 

diff --git a/staging/src/k8s.io/apiserver/pkg/server/options/patch_restmapper.go b/staging/src/k8s.io/apiserver/pkg/server/options/patch_restmapper.go
@@ -0,0 +1,11 @@
+package options
+
+import (
+	"k8s.io/apimachinery/pkg/api/meta"
+
+	"github.com/openshift/library-go/pkg/client/openshiftrestmapper"
+)
+
+func NewAdmissionRESTMapper(delegate meta.RESTMapper) meta.RESTMapper {
+	return openshiftrestmapper.NewOpenShiftHardcodedRESTMapper(delegate)
+}