Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
7f1a6174
Unverified
Commit
7f1a6174
authored
Aug 11, 2017
by
Jordan Liggitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
select an RBAC version for kubefed it knows how to speak
parent
92d9e442
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
2 deletions
+28
-2
BUILD
federation/pkg/kubefed/util/BUILD
+3
-0
util.go
federation/pkg/kubefed/util/util.go
+25
-2
No files found.
federation/pkg/kubefed/util/BUILD
View file @
7f1a6174
...
...
@@ -14,6 +14,9 @@ go_library(
"//federation/client/clientset_generated/federation_clientset:go_default_library",
"//pkg/api:go_default_library",
"//pkg/apis/rbac:go_default_library",
"//pkg/apis/rbac/v1:go_default_library",
"//pkg/apis/rbac/v1alpha1:go_default_library",
"//pkg/apis/rbac/v1beta1:go_default_library",
"//pkg/client/clientset_generated/internalclientset:go_default_library",
"//pkg/kubectl/cmd:go_default_library",
"//pkg/kubectl/cmd/util:go_default_library",
...
...
federation/pkg/kubefed/util/util.go
View file @
7f1a6174
...
...
@@ -32,6 +32,9 @@ import (
fedclient
"k8s.io/kubernetes/federation/client/clientset_generated/federation_clientset"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/apis/rbac"
rbacv1
"k8s.io/kubernetes/pkg/apis/rbac/v1"
rbacv1alpha1
"k8s.io/kubernetes/pkg/apis/rbac/v1alpha1"
rbacv1beta1
"k8s.io/kubernetes/pkg/apis/rbac/v1beta1"
client
"k8s.io/kubernetes/pkg/client/clientset_generated/internalclientset"
kubectlcmd
"k8s.io/kubernetes/pkg/kubectl/cmd"
cmdutil
"k8s.io/kubernetes/pkg/kubectl/cmd/util"
...
...
@@ -285,6 +288,16 @@ func getRBACVersion(discoveryclient discovery.CachedDiscoveryInterface) (*schema
return
nil
,
fmt
.
Errorf
(
"Couldn't get clientset to create RBAC roles in the host cluster: %v"
,
err
)
}
// These are the RBAC versions we can speak
knownVersions
:=
map
[
schema
.
GroupVersion
]
bool
{
rbacv1
.
SchemeGroupVersion
:
true
,
rbacv1alpha1
.
SchemeGroupVersion
:
true
,
rbacv1beta1
.
SchemeGroupVersion
:
true
,
}
// This holds any RBAC versions listed in discovery we do not know how to speak
unknownVersions
:=
[]
schema
.
GroupVersion
{}
for
_
,
g
:=
range
groupList
.
Groups
{
if
g
.
Name
==
rbac
.
GroupName
{
if
g
.
PreferredVersion
.
GroupVersion
!=
""
{
...
...
@@ -292,7 +305,9 @@ func getRBACVersion(discoveryclient discovery.CachedDiscoveryInterface) (*schema
if
err
!=
nil
{
return
nil
,
err
}
return
&
gv
,
nil
if
knownVersions
[
gv
]
{
return
&
gv
,
nil
}
}
for
_
,
version
:=
range
g
.
Versions
{
if
version
.
GroupVersion
!=
""
{
...
...
@@ -300,12 +315,20 @@ func getRBACVersion(discoveryclient discovery.CachedDiscoveryInterface) (*schema
if
err
!=
nil
{
return
nil
,
err
}
return
&
gv
,
nil
if
knownVersions
[
gv
]
{
return
&
gv
,
nil
}
else
{
unknownVersions
=
append
(
unknownVersions
,
gv
)
}
}
}
}
}
if
len
(
unknownVersions
)
>
0
{
return
nil
,
&
NoRBACAPIError
{
fmt
.
Sprintf
(
"%s
\n
Unknown RBAC API versions: %v"
,
rbacAPINotAvailable
,
unknownVersions
)}
}
return
nil
,
&
NoRBACAPIError
{
rbacAPINotAvailable
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment