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 · Mar 27, 2023 · 35bb7a8 · 35bb7a8
1 parent 5fc48b4
commit 35bb7a8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/pkg/kubeapiserver/admission/config.go b/pkg/kubeapiserver/admission/config.go
@@ -68,7 +68,7 @@ func (c *Config) New(proxyTransport *http.Transport, egressSelector *egressselec
 	discoveryRESTMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
 	kubePluginInitializer := NewPluginInitializer(
 		cloudConfig,
-		discoveryRESTMapper,
+		NewAdmissionRESTMapper(discoveryRESTMapper),
 		quotainstall.NewQuotaConfigurationForAdmission(),
 		schemaResolver,
 	)

diff --git a/pkg/kubeapiserver/admission/patch_restmapper.go b/pkg/kubeapiserver/admission/patch_restmapper.go
@@ -0,0 +1,11 @@
+package admission
+
+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)
+}