github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #26849 from olegshaldybin/add-list-options 

Automatic merge from submit-queue

Add ListOptions to RBAC group

[![Analytics](https://kubernetes-site.appspot.com/UA-36037335-10/GitHub/.github/PULL_REQUEST_TEMPLATE.md?pixel)]()

Otherwise clientset complains about unregistered kind when ListOptions
are passed.
pull/6/head
k8s-merge-robot 2016-06-04 16:32:57 -07:00
parent 421c16addd ba3c7d33cd
commit 1c860c9a7e
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/rbac/register.go
View File

@ -17,6 +17,7 @@ limitations under the License.
package rbac
import (
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch/versioned"
@ -54,6 +55,10 @@ func addKnownTypes(scheme *runtime.Scheme) {
&ClusterRoleBinding{},
&ClusterRoleBindingList{},
&ClusterRoleList{},
&api.ListOptions{},
&api.DeleteOptions{},
&api.ExportOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
}

5
pkg/apis/rbac/v1alpha1/register.go
View File

@ -18,6 +18,7 @@ package v1alpha1
import (
"k8s.io/kubernetes/pkg/api/unversioned"
"k8s.io/kubernetes/pkg/api/v1"
"k8s.io/kubernetes/pkg/apis/rbac"
"k8s.io/kubernetes/pkg/runtime"
"k8s.io/kubernetes/pkg/watch/versioned"
@ -42,6 +43,10 @@ func addKnownTypes(scheme *runtime.Scheme) {
&ClusterRoleBinding{},
&ClusterRoleBindingList{},
&ClusterRoleList{},
&v1.ListOptions{},
&v1.DeleteOptions{},
&v1.ExportOptions{},
)
versioned.AddToGroupVersion(scheme, SchemeGroupVersion)
}