Skip to content

Commit 883c728

Browse files
deads2kbertinatto
authored andcommitted
UPSTREAM: <carry>: hardcoded restmapper with a few entries to rebootstrap SDN when SDN is down
UPSTREAM: <carry>: use hardcoded rest mapper from library-go OpenShift-Rebase-Source: a00f75d
1 parent b0dcf84 commit 883c728

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

staging/src/k8s.io/apiserver/pkg/server/options/admission.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ func (a *AdmissionOptions) ApplyTo(
154154
discoveryClient := cacheddiscovery.NewMemCacheClient(kubeClient.Discovery())
155155
discoveryRESTMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
156156
genericInitializer := initializer.New(kubeClient, dynamicClient, informers, c.Authorization.Authorizer, features,
157-
c.DrainedNotify(), discoveryRESTMapper)
157+
c.DrainedNotify(), NewAdmissionRESTMapper(discoveryRESTMapper))
158158
initializersChain := admission.PluginInitializers{genericInitializer}
159159
initializersChain = append(initializersChain, pluginInitializers...)
160160

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package options
2+
3+
import (
4+
"k8s.io/apimachinery/pkg/api/meta"
5+
6+
"github.com/openshift/library-go/pkg/client/openshiftrestmapper"
7+
)
8+
9+
func NewAdmissionRESTMapper(delegate meta.RESTMapper) meta.RESTMapper {
10+
return openshiftrestmapper.NewOpenShiftHardcodedRESTMapper(delegate)
11+
}

0 commit comments

Comments
 (0)