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
05a0f649
Commit
05a0f649
authored
Jan 30, 2017
by
Madhusudan.C.S
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Address review comments.
parent
4aeef0c7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
init.go
federation/pkg/kubefed/init/init.go
+4
-2
helpers.go
pkg/apis/rbac/helpers.go
+11
-0
No files found.
federation/pkg/kubefed/init/init.go
View file @
05a0f649
...
@@ -576,8 +576,10 @@ func createRoleBindings(clientset *client.Clientset, namespace, saName string, d
...
@@ -576,8 +576,10 @@ func createRoleBindings(clientset *client.Clientset, namespace, saName string, d
},
},
}
}
rolebinding
:=
rbac
.
NewRoleBinding
(
roleName
,
namespace
)
.
SAs
(
namespace
,
saName
)
.
BindingOrDie
()
rolebinding
,
err
:=
rbac
.
NewRoleBinding
(
roleName
,
namespace
)
.
SAs
(
namespace
,
saName
)
.
Binding
()
rolebinding
.
Namespace
=
namespace
if
err
!=
nil
{
return
nil
,
nil
,
err
}
rolebinding
.
Labels
=
componentLabel
rolebinding
.
Labels
=
componentLabel
if
dryRun
{
if
dryRun
{
...
...
pkg/apis/rbac/helpers.go
View file @
05a0f649
...
@@ -262,6 +262,10 @@ type RoleBindingBuilder struct {
...
@@ -262,6 +262,10 @@ type RoleBindingBuilder struct {
RoleBinding
RoleBinding
RoleBinding
RoleBinding
}
}
// NewRoleBinding creates a RoleBinding builder that can be used
// to define the subjects of a role binding. At least one of
// the `Groups`, `Users` or `SAs` method must be called before
// calling the `Binding*` methods.
func
NewRoleBinding
(
roleName
,
namespace
string
)
*
RoleBindingBuilder
{
func
NewRoleBinding
(
roleName
,
namespace
string
)
*
RoleBindingBuilder
{
return
&
RoleBindingBuilder
{
return
&
RoleBindingBuilder
{
RoleBinding
:
RoleBinding
{
RoleBinding
:
RoleBinding
{
...
@@ -278,6 +282,7 @@ func NewRoleBinding(roleName, namespace string) *RoleBindingBuilder {
...
@@ -278,6 +282,7 @@ func NewRoleBinding(roleName, namespace string) *RoleBindingBuilder {
}
}
}
}
// Groups adds the specified groups as the subjects of the RoleBinding.
func
(
r
*
RoleBindingBuilder
)
Groups
(
groups
...
string
)
*
RoleBindingBuilder
{
func
(
r
*
RoleBindingBuilder
)
Groups
(
groups
...
string
)
*
RoleBindingBuilder
{
for
_
,
group
:=
range
groups
{
for
_
,
group
:=
range
groups
{
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
GroupKind
,
Name
:
group
})
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
GroupKind
,
Name
:
group
})
...
@@ -285,6 +290,7 @@ func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
...
@@ -285,6 +290,7 @@ func (r *RoleBindingBuilder) Groups(groups ...string) *RoleBindingBuilder {
return
r
return
r
}
}
// Users adds the specified users as the subjects of the RoleBinding.
func
(
r
*
RoleBindingBuilder
)
Users
(
users
...
string
)
*
RoleBindingBuilder
{
func
(
r
*
RoleBindingBuilder
)
Users
(
users
...
string
)
*
RoleBindingBuilder
{
for
_
,
user
:=
range
users
{
for
_
,
user
:=
range
users
{
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
UserKind
,
Name
:
user
})
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
UserKind
,
Name
:
user
})
...
@@ -292,6 +298,8 @@ func (r *RoleBindingBuilder) Users(users ...string) *RoleBindingBuilder {
...
@@ -292,6 +298,8 @@ func (r *RoleBindingBuilder) Users(users ...string) *RoleBindingBuilder {
return
r
return
r
}
}
// SAs adds the specified service accounts as the subjects of the
// RoleBinding.
func
(
r
*
RoleBindingBuilder
)
SAs
(
namespace
string
,
serviceAccountNames
...
string
)
*
RoleBindingBuilder
{
func
(
r
*
RoleBindingBuilder
)
SAs
(
namespace
string
,
serviceAccountNames
...
string
)
*
RoleBindingBuilder
{
for
_
,
saName
:=
range
serviceAccountNames
{
for
_
,
saName
:=
range
serviceAccountNames
{
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
ServiceAccountKind
,
Namespace
:
namespace
,
Name
:
saName
})
r
.
RoleBinding
.
Subjects
=
append
(
r
.
RoleBinding
.
Subjects
,
Subject
{
Kind
:
ServiceAccountKind
,
Namespace
:
namespace
,
Name
:
saName
})
...
@@ -299,6 +307,7 @@ func (r *RoleBindingBuilder) SAs(namespace string, serviceAccountNames ...string
...
@@ -299,6 +307,7 @@ func (r *RoleBindingBuilder) SAs(namespace string, serviceAccountNames ...string
return
r
return
r
}
}
// BindingOrDie calls the binding method and panics if there is an error.
func
(
r
*
RoleBindingBuilder
)
BindingOrDie
()
RoleBinding
{
func
(
r
*
RoleBindingBuilder
)
BindingOrDie
()
RoleBinding
{
ret
,
err
:=
r
.
Binding
()
ret
,
err
:=
r
.
Binding
()
if
err
!=
nil
{
if
err
!=
nil
{
...
@@ -307,6 +316,8 @@ func (r *RoleBindingBuilder) BindingOrDie() RoleBinding {
...
@@ -307,6 +316,8 @@ func (r *RoleBindingBuilder) BindingOrDie() RoleBinding {
return
ret
return
ret
}
}
// Binding builds and returns the RoleBinding API object from the builder
// object.
func
(
r
*
RoleBindingBuilder
)
Binding
()
(
RoleBinding
,
error
)
{
func
(
r
*
RoleBindingBuilder
)
Binding
()
(
RoleBinding
,
error
)
{
if
len
(
r
.
RoleBinding
.
Subjects
)
==
0
{
if
len
(
r
.
RoleBinding
.
Subjects
)
==
0
{
return
RoleBinding
{},
fmt
.
Errorf
(
"subjects are required: %#v"
,
r
.
RoleBinding
)
return
RoleBinding
{},
fmt
.
Errorf
(
"subjects are required: %#v"
,
r
.
RoleBinding
)
...
...
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