Skip to content

Commit cecf9da

Browse files
committed
UPSTREAM: <carry>: use hardcoded metrics scraping authorizer for delegated apiservers
1 parent 69d7e87 commit cecf9da

File tree

2 files changed

+7
-0
lines changed

2 files changed

+7
-0
lines changed

openshift-kube-apiserver/openshiftkubeapiserver/patch.go

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,9 @@ import (
3131
"k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers"
3232
"k8s.io/kubernetes/openshift-kube-apiserver/admission/authorization/restrictusers/usercache"
3333
"k8s.io/kubernetes/openshift-kube-apiserver/admission/scheduler/nodeenv"
34+
35+
// magnet to get authorizer package in hack/update-vendor.sh
36+
_ "github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer"
3437
)
3538

3639
func OpenShiftKubeAPIServerConfigPatch(genericConfig *genericapiserver.Config, kubeInformers clientgoinformers.SharedInformerFactory, pluginInitializers *[]admission.PluginInitializer) error {

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import (
2323
"github.com/spf13/pflag"
2424
"k8s.io/klog/v2"
2525

26+
"github.com/openshift/library-go/pkg/authorization/hardcodedauthorizer"
2627
"k8s.io/apimachinery/pkg/util/wait"
2728
"k8s.io/apiserver/pkg/authorization/authorizer"
2829
"k8s.io/apiserver/pkg/authorization/authorizerfactory"
@@ -161,6 +162,9 @@ func (s *DelegatingAuthorizationOptions) toAuthorizer(client kubernetes.Interfac
161162
authorizers = append(authorizers, authorizerfactory.NewPrivilegedGroups(s.AlwaysAllowGroups...))
162163
}
163164

165+
// add an authorizer to always approver the openshift metrics scraper.
166+
authorizers = append(authorizers, hardcodedauthorizer.NewHardCodedMetricsAuthorizer())
167+
164168
if len(s.AlwaysAllowPaths) > 0 {
165169
a, err := path.NewAuthorizer(s.AlwaysAllowPaths)
166170
if err != nil {

0 commit comments

Comments
 (0)