Skip to content

K
k3s
Commit ca7848a7 authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #37714 from deads2k/auth-08-client-fallout

Automatic merge from submit-queue fix rbac informer. it's listers are all internal Fixes https://github.com/kubernetes/kubernetes/issues/37615 The rbac informer still uses internal types in its listers, which means it must use internal clients for evaluation. Since its running inside the API server, this seems ok for now and we can/should fix it when generated informers come along. This just patches us to keep RBAC working. @kubernetes/sig-auth @sttts @liggitt this is broken in master, let's get it sorted quickly.
parents 35808b39 672eb992
Hide whitespace changes
Inline Side-by-side
Showing with 17 additions and 8 deletions
pkg/controller/informers/rbac.go
View file @ ca7848a7
...@@ -19,6 +19,7 @@ package informers ...@@ -19,6 +19,7 @@ package informers
import ( import (
"reflect" "reflect"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/v1" "k8s.io/kubernetes/pkg/api/v1"
rbac "k8s.io/kubernetes/pkg/apis/rbac" rbac "k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/client/cache" "k8s.io/kubernetes/pkg/client/cache"
...@@ -47,10 +48,10 @@ func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer { ...@@ -47,10 +48,10 @@ func (f *clusterRoleInformer) Informer() cache.SharedIndexInformer {
informer = cache.NewSharedIndexInformer( informer = cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) { ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return f.client.Rbac().ClusterRoles().List(options) return f.internalclient.Rbac().ClusterRoles().List(convertListOptionsOrDie(options))
}, },
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return f.client.Rbac().ClusterRoles().Watch(options) return f.internalclient.Rbac().ClusterRoles().Watch(convertListOptionsOrDie(options))
}, },
}, },
&rbac.ClusterRole{}, &rbac.ClusterRole{},
...@@ -87,10 +88,10 @@ func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer { ...@@ -87,10 +88,10 @@ func (f *clusterRoleBindingInformer) Informer() cache.SharedIndexInformer {
informer = cache.NewSharedIndexInformer( informer = cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) { ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return f.client.Rbac().ClusterRoleBindings().List(options) return f.internalclient.Rbac().ClusterRoleBindings().List(convertListOptionsOrDie(options))
}, },
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return f.client.Rbac().ClusterRoleBindings().Watch(options) return f.internalclient.Rbac().ClusterRoleBindings().Watch(convertListOptionsOrDie(options))
}, },
}, },
&rbac.ClusterRoleBinding{}, &rbac.ClusterRoleBinding{},
...@@ -127,10 +128,10 @@ func (f *roleInformer) Informer() cache.SharedIndexInformer { ...@@ -127,10 +128,10 @@ func (f *roleInformer) Informer() cache.SharedIndexInformer {
informer = cache.NewSharedIndexInformer( informer = cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) { ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return f.client.Rbac().Roles(v1.NamespaceAll).List(options) return f.internalclient.Rbac().Roles(v1.NamespaceAll).List(convertListOptionsOrDie(options))
}, },
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return f.client.Rbac().Roles(v1.NamespaceAll).Watch(options) return f.internalclient.Rbac().Roles(v1.NamespaceAll).Watch(convertListOptionsOrDie(options))
}, },
}, },
&rbac.Role{}, &rbac.Role{},
...@@ -167,10 +168,10 @@ func (f *roleBindingInformer) Informer() cache.SharedIndexInformer { ...@@ -167,10 +168,10 @@ func (f *roleBindingInformer) Informer() cache.SharedIndexInformer {
informer = cache.NewSharedIndexInformer( informer = cache.NewSharedIndexInformer(
&cache.ListWatch{ &cache.ListWatch{
ListFunc: func(options v1.ListOptions) (runtime.Object, error) { ListFunc: func(options v1.ListOptions) (runtime.Object, error) {
return f.client.Rbac().RoleBindings(v1.NamespaceAll).List(options) return f.internalclient.Rbac().RoleBindings(v1.NamespaceAll).List(convertListOptionsOrDie(options))
}, },
WatchFunc: func(options v1.ListOptions) (watch.Interface, error) { WatchFunc: func(options v1.ListOptions) (watch.Interface, error) {
return f.client.Rbac().RoleBindings(v1.NamespaceAll).Watch(options) return f.internalclient.Rbac().RoleBindings(v1.NamespaceAll).Watch(convertListOptionsOrDie(options))
}, },
}, },
&rbac.RoleBinding{}, &rbac.RoleBinding{},
...@@ -185,3 +186,11 @@ func (f *roleBindingInformer) Informer() cache.SharedIndexInformer { ...@@ -185,3 +186,11 @@ func (f *roleBindingInformer) Informer() cache.SharedIndexInformer {
func (f *roleBindingInformer) Lister() cache.RoleBindingLister { func (f *roleBindingInformer) Lister() cache.RoleBindingLister {
return cache.NewRoleBindingLister(f.Informer().GetIndexer()) return cache.NewRoleBindingLister(f.Informer().GetIndexer())
} }
func convertListOptionsOrDie(in v1.ListOptions) api.ListOptions {
out := api.ListOptions{}
if err := api.Scheme.Convert(&in, &out, nil); err != nil {
panic(err)
}
return out
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment