Merge pull request kubernetes#22765 from deads2k/sally-rbr

add RBR from CRDs

Origin-commit: a0a3b1f6f90faae6f960030136b54aa5800369cf

staging/src/k8s.io/kube-aggregator/pkg/apiserver/handler_proxy.go

@@ -22,9 +22,8 @@ import (
 	"net/url"
 	"sync/atomic"
 
-	"k8s.io/klog"
-
 	"k8s.io/apimachinery/pkg/runtime"
+	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/apimachinery/pkg/util/httpstream"
 	"k8s.io/apimachinery/pkg/util/httpstream/spdy"
 	utilnet "k8s.io/apimachinery/pkg/util/net"
@@ -36,6 +35,7 @@ import (
 	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	restclient "k8s.io/client-go/rest"
 	"k8s.io/client-go/transport"
+	"k8s.io/klog"
 	apiregistrationapi "k8s.io/kube-aggregator/pkg/apis/apiregistration"
 )
 
@@ -109,6 +109,14 @@ func (r *proxyHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 		return
 	}
 
+	// some groupResources should always be delegated
+	if requestInfo, ok := genericapirequest.RequestInfoFrom(req.Context()); ok {
+		if alwaysLocalDelegateGroupResource[schema.GroupResource{Group: requestInfo.APIGroup, Resource: requestInfo.Resource}] {
+			r.localDelegate.ServeHTTP(w, req)
+			return
+		}
+	}
+
 	if !handlingInfo.serviceAvailable {
 		proxyError(w, req, "service unavailable", http.StatusServiceUnavailable)
 		return

staging/src/k8s.io/kube-aggregator/pkg/apiserver/patch_always_local_delegate.go

@@ -28,6 +28,12 @@ func AddOverlappingGroupVersion(groupVersion schema.GroupVersion) {
 	overlappingGroupVersion[groupVersion] = true
 }
 
+var alwaysLocalDelegateGroupResource = map[schema.GroupResource]bool{}
+
+func AddAlwaysLocalDelegateGroupResource(groupResource schema.GroupResource) {
+	alwaysLocalDelegateGroupResource[groupResource] = true
+}
+
 func APIServiceAlreadyExists(groupVersion schema.GroupVersion) bool {
 	if overlappingGroupVersion[groupVersion] {
 		return true