Merge pull request #64458 from mrogers950/reconcile-dryrun-additive

Automatic merge from submit-queue (batch tested with PRs 64322, 64210, 64458, 64232, 64370). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Add dry-run flag to auth reconcile ```release-note The --dry-run flag has been enabled for kubectl auth reconcile ``` /assign @juanvallejo cc @enj

Merge pull request #64458 from mrogers950/reconcile-dryrun-additive
75517f60 · Kubernetes Submit Queue · GitHub · 31815fc8 · 20cd94de · 75517f60
Unverified Commit 75517f60 authored May 30, 2018 by Kubernetes Submit Queue Committed by GitHub May 30, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 4 deletions

reconcile.go pkg/kubectl/cmd/auth/reconcile.go +9 -4

No files found.
--- a/pkg/kubectl/cmd/auth/reconcile.go
+++ b/pkg/kubectl/cmd/auth/reconcile.go
@@ -39,6 +39,7 @@ import (
 type ReconcileOptions struct {
 	PrintFlags      *genericclioptions.PrintFlags
 	FilenameOptions *resource.FilenameOptions
+	DryRun          bool

 	Visitor         resource.Visitor
 	RBACClient      rbacv1client.RbacV1Interface
@@ -87,6 +88,7 @@ func NewCmdReconcile(f cmdutil.Factory, streams genericclioptions.IOStreams) *co
 	o.PrintFlags.AddFlags(cmd)

 	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.MarkFlagRequired("filename")

 	return cmd
@@ -128,6 +130,9 @@ func (o *ReconcileOptions) Complete(cmd *cobra.Command, f cmdutil.Factory, args 
 		return err
 	}

+	if o.DryRun {
+		o.PrintFlags.Complete("%s (dry run)")
+	}
 	printer, err := o.PrintFlags.ToPrinter()
 	if err != nil {
 		return err
@@ -168,7 +173,7 @@ func (o *ReconcileOptions) RunReconcile() error {
 		switch t := info.Object.(type) {
 		case *rbacv1.Role:
 			reconcileOptions := reconciliation.ReconcileRoleOptions{
-				Confirm:                true,
+				Confirm:                !o.DryRun,
 				RemoveExtraPermissions: false,
 				Role: reconciliation.RoleRuleOwner{Role: t},
 				Client: reconciliation.RoleModifier{
@@ -184,7 +189,7 @@ func (o *ReconcileOptions) RunReconcile() error {

 		case *rbacv1.ClusterRole:
 			reconcileOptions := reconciliation.ReconcileRoleOptions{
-				Confirm:                true,
+				Confirm:                !o.DryRun,
 				RemoveExtraPermissions: false,
 				Role: reconciliation.ClusterRoleRuleOwner{ClusterRole: t},
 				Client: reconciliation.ClusterRoleModifier{
@@ -199,7 +204,7 @@ func (o *ReconcileOptions) RunReconcile() error {

 		case *rbacv1.RoleBinding:
 			reconcileOptions := reconciliation.ReconcileRoleBindingOptions{
-				Confirm:             true,
+				Confirm:             !o.DryRun,
 				RemoveExtraSubjects: false,
 				RoleBinding:         reconciliation.RoleBindingAdapter{RoleBinding: t},
 				Client: reconciliation.RoleBindingClientAdapter{
@@ -215,7 +220,7 @@ func (o *ReconcileOptions) RunReconcile() error {

 		case *rbacv1.ClusterRoleBinding:
 			reconcileOptions := reconciliation.ReconcileRoleBindingOptions{
-				Confirm:             true,
+				Confirm:             !o.DryRun,
 				RemoveExtraSubjects: false,
 				RoleBinding:         reconciliation.ClusterRoleBindingAdapter{ClusterRoleBinding: t},
 				Client: reconciliation.ClusterRoleBindingClientAdapter{