Skip to content

Commit a00f75d

Browse files
deads2ksoltysh
authored andcommitted
UPSTREAM: <carry>: hardcoded restmapper with a few entries to rebootstrap SDN when SDN is down
Origin-commit: 36c5e7d672bf82bd09ee382564bc03ef8e1b3a76 openshift-rebase(v1.24):source=b4aee491855 UPSTREAM: <carry>: use hardcoded rest mapper from library-go openshift-rebase(v1.24):source=58f3815bab1 openshift-rebase(v1.24):source=58f3815bab1 openshift-rebase(v1.24):source=58f3815bab1
1 parent 1a1d469 commit a00f75d

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

Diff for: pkg/kubeapiserver/admission/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func (c *Config) New(proxyTransport *http.Transport, egressSelector *egressselec
6868
discoveryRESTMapper := restmapper.NewDeferredDiscoveryRESTMapper(discoveryClient)
6969
kubePluginInitializer := NewPluginInitializer(
7070
cloudConfig,
71-
discoveryRESTMapper,
71+
NewAdmissionRESTMapper(discoveryRESTMapper),
7272
quotainstall.NewQuotaConfigurationForAdmission(),
7373
)
7474

Diff for: pkg/kubeapiserver/admission/patch_restmapper.go

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
package admission
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)