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
9f3b9757
Commit
9f3b9757
authored
May 30, 2018
by
Matt Rogers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add more kubectl auth reconcile flags
Adds --remove-extra-permissions and --remove-extra-subjects Signed-off-by:
Matt Rogers
<
mrogers@redhat.com
>
parent
99ebcd94
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
7 deletions
+11
-7
reconcile.go
pkg/kubectl/cmd/auth/reconcile.go
+11
-7
No files found.
pkg/kubectl/cmd/auth/reconcile.go
View file @
9f3b9757
...
...
@@ -37,9 +37,11 @@ import (
// ReconcileOptions is the start of the data required to perform the operation. As new fields are added, add them here instead of
// referencing the cmd.Flags()
type
ReconcileOptions
struct
{
PrintFlags
*
genericclioptions
.
PrintFlags
FilenameOptions
*
resource
.
FilenameOptions
DryRun
bool
PrintFlags
*
genericclioptions
.
PrintFlags
FilenameOptions
*
resource
.
FilenameOptions
DryRun
bool
RemoveExtraPermissions
bool
RemoveExtraSubjects
bool
Visitor
resource
.
Visitor
RBACClient
rbacv1client
.
RbacV1Interface
...
...
@@ -89,6 +91,8 @@ func NewCmdReconcile(f cmdutil.Factory, streams genericclioptions.IOStreams) *co
cmdutil
.
AddFilenameOptionFlags
(
cmd
,
o
.
FilenameOptions
,
"identifying the resource to reconcile."
)
cmd
.
Flags
()
.
BoolVar
(
&
o
.
DryRun
,
"dry-run"
,
o
.
DryRun
,
"If true, display results but do not submit changes"
)
cmd
.
Flags
()
.
BoolVar
(
&
o
.
RemoveExtraPermissions
,
"remove-extra-permissions"
,
o
.
RemoveExtraPermissions
,
"If true, removes extra permissions added to roles"
)
cmd
.
Flags
()
.
BoolVar
(
&
o
.
RemoveExtraSubjects
,
"remove-extra-subjects"
,
o
.
RemoveExtraSubjects
,
"If true, removes extra subjects added to rolebindings"
)
cmd
.
MarkFlagRequired
(
"filename"
)
return
cmd
...
...
@@ -174,7 +178,7 @@ func (o *ReconcileOptions) RunReconcile() error {
case
*
rbacv1
.
Role
:
reconcileOptions
:=
reconciliation
.
ReconcileRoleOptions
{
Confirm
:
!
o
.
DryRun
,
RemoveExtraPermissions
:
false
,
RemoveExtraPermissions
:
o
.
RemoveExtraPermissions
,
Role
:
reconciliation
.
RoleRuleOwner
{
Role
:
t
},
Client
:
reconciliation
.
RoleModifier
{
NamespaceClient
:
o
.
NamespaceClient
.
Namespaces
(),
...
...
@@ -190,7 +194,7 @@ func (o *ReconcileOptions) RunReconcile() error {
case
*
rbacv1
.
ClusterRole
:
reconcileOptions
:=
reconciliation
.
ReconcileRoleOptions
{
Confirm
:
!
o
.
DryRun
,
RemoveExtraPermissions
:
false
,
RemoveExtraPermissions
:
o
.
RemoveExtraPermissions
,
Role
:
reconciliation
.
ClusterRoleRuleOwner
{
ClusterRole
:
t
},
Client
:
reconciliation
.
ClusterRoleModifier
{
Client
:
o
.
RBACClient
.
ClusterRoles
(),
...
...
@@ -205,7 +209,7 @@ func (o *ReconcileOptions) RunReconcile() error {
case
*
rbacv1
.
RoleBinding
:
reconcileOptions
:=
reconciliation
.
ReconcileRoleBindingOptions
{
Confirm
:
!
o
.
DryRun
,
RemoveExtraSubjects
:
false
,
RemoveExtraSubjects
:
o
.
RemoveExtraSubjects
,
RoleBinding
:
reconciliation
.
RoleBindingAdapter
{
RoleBinding
:
t
},
Client
:
reconciliation
.
RoleBindingClientAdapter
{
Client
:
o
.
RBACClient
,
...
...
@@ -221,7 +225,7 @@ func (o *ReconcileOptions) RunReconcile() error {
case
*
rbacv1
.
ClusterRoleBinding
:
reconcileOptions
:=
reconciliation
.
ReconcileRoleBindingOptions
{
Confirm
:
!
o
.
DryRun
,
RemoveExtraSubjects
:
false
,
RemoveExtraSubjects
:
o
.
RemoveExtraSubjects
,
RoleBinding
:
reconciliation
.
ClusterRoleBindingAdapter
{
ClusterRoleBinding
:
t
},
Client
:
reconciliation
.
ClusterRoleBindingClientAdapter
{
Client
:
o
.
RBACClient
.
ClusterRoleBindings
(),
...
...
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