github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97645 from pandaamanda/kubectl_auth_reconcile_fatal

Browse Source 
cleanup: change klog.Fatalf to fmt.Errorf for `kubectl auth reconcile`
This commit is contained in:
Kubernetes Prow Robot 2021-01-06 13:53:45 -08:00 committed by GitHub
commit 3552bb5d8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
staging/src/k8s.io/kubectl/pkg/cmd/auth/reconcile.go
View File

@ -58,7 +58,7 @@ type ReconcileOptions struct {
var ( var (
reconcileLong = templates.LongDesc(` reconcileLong = templates.LongDesc(`
Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRole binding objects. Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRoleBinding objects.
Missing objects are created, and the containing namespace is created for namespaced objects, if required. Missing objects are created, and the containing namespace is created for namespaced objects, if required.
@ -91,7 +91,7 @@ func NewCmdReconcile(f cmdutil.Factory, streams genericclioptions.IOStreams) *co
cmd := &cobra.Command{ cmd := &cobra.Command{
Use: "reconcile -f FILENAME", Use: "reconcile -f FILENAME",
DisableFlagsInUseLine: true, DisableFlagsInUseLine: true,
Short: "Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRole binding objects", Short: "Reconciles rules for RBAC Role, RoleBinding, ClusterRole, and ClusterRoleBinding objects",
Long: reconcileLong, Long: reconcileLong,
Example: reconcileExample, Example: reconcileExample,
Run: func(cmd *cobra.Command, args []string) { Run: func(cmd *cobra.Command, args []string) {
@ -121,7 +121,11 @@ func (o *ReconcileOptions) Complete(cmd *cobra.Command, f cmdutil.Factory, args
return errors.New("no arguments are allowed") return errors.New("no arguments are allowed")
} }
o.DryRun = getClientSideDryRun(cmd) dryRun, err := getClientSideDryRun(cmd)
if err != nil {
return err
}
o.DryRun = dryRun
namespace, enforceNamespace, err := f.ToRawKubeConfigLoader().Namespace() namespace, enforceNamespace, err := f.ToRawKubeConfigLoader().Namespace()
if err != nil { if err != nil {
@ -331,13 +335,13 @@ func (o *ReconcileOptions) printResults(object runtime.Object,
} }
} }
func getClientSideDryRun(cmd *cobra.Command) bool { func getClientSideDryRun(cmd *cobra.Command) (bool, error) {
dryRunStrategy, err := cmdutil.GetDryRunStrategy(cmd) dryRunStrategy, err := cmdutil.GetDryRunStrategy(cmd)
if err != nil { if err != nil {
klog.Fatalf("error accessing --dry-run flag for command %s: %v", cmd.Name(), err) return false, fmt.Errorf("error accessing --dry-run flag for command %s: %v", cmd.Name(), err)
} }
if dryRunStrategy == cmdutil.DryRunServer { if dryRunStrategy == cmdutil.DryRunServer {
klog.Fatalf("--dry-run=server for command %s is not supported yet", cmd.Name()) return false, fmt.Errorf("--dry-run=server for command %s is not supported yet", cmd.Name())
} }
return dryRunStrategy == cmdutil.DryRunClient return dryRunStrategy == cmdutil.DryRunClient, nil
} }