Merge pull request #11639 from pweil-/bulk-level-filter

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/admin/router/router.go

@@ -711,7 +711,7 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 		objects = append(objects,
 			&kapi.ServiceAccount{ObjectMeta: kapi.ObjectMeta{Name: cfg.ServiceAccount}},
 			&authapi.ClusterRoleBinding{
-				ObjectMeta: kapi.ObjectMeta{Name: fmt.Sprintf("router-%s-role", cfg.Name)},
+				ObjectMeta: kapi.ObjectMeta{Name: generateRoleBindingName(cfg.Name)},
 				Subjects: []kapi.ObjectReference{
 					{
 						Kind:      "ServiceAccount",
@@ -789,12 +789,49 @@ func RunCmdRouter(f *clientcmd.Factory, cmd *cobra.Command, out, errout io.Write
 		return defaultOutputErr
 	}
 
-	if errs := cfg.Action.WithMessage(fmt.Sprintf("Creating router %s", cfg.Name), "created").Run(list, namespace); len(errs) > 0 {
+	levelPrefixFilter := func(e error) string {
+		// only ignore SA/RB errors if we were creating the service account
+		if createServiceAccount && ignoreError(e, cfg.ServiceAccount, generateRoleBindingName(cfg.Name)) {
+			return "warning"
+		}
+		return "error"
+	}
+
+	cfg.Action.Bulk.IgnoreError = func(e error) bool {
+		return levelPrefixFilter(e) == "warning"
+	}
+
+	if errs := cfg.Action.WithMessageAndPrefix(fmt.Sprintf("Creating router %s", cfg.Name), "created", levelPrefixFilter).Run(list, namespace); len(errs) > 0 {
 		return cmdutil.ErrExit
 	}
 	return nil
 }
 
+// ignoreError will return true if the error is an already exists status error and
+// 1. it is for a cluster role binding named roleBindingName
+// 2. it is for a serivce account name saName
+func ignoreError(e error, saName string, roleBindingName string) bool {
+	if !errors.IsAlreadyExists(e) {
+		return false
+	}
+	statusError, ok := e.(*errors.StatusError)
+	if !ok {
+		return false
+	}
+	details := statusError.Status().Details
+	if details == nil {
+		return false
+	}
+	return (details.Kind == "serviceaccounts" && details.Name == saName) ||
+		(details.Kind == "clusterrolebinding" && details.Name == roleBindingName)
+}
+
+// generateRoleBindingName generates a name for the rolebinding object if it is
+// being created.
+func generateRoleBindingName(name string) string {
+	return fmt.Sprintf("router-%s-role", name)
+}
+
 // generateStatsPassword creates a random password.
 func generateStatsPassword() string {
 	allowableChars := []rune("abcdefghijlkmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890")

pkg/config/cmd/cmd.go

@@ -35,13 +35,21 @@ type Mapper interface {
 	InfoForObject(obj runtime.Object, preferredGVKs []unversioned.GroupVersionKind) (*resource.Info, error)
 }
 
+// IgnoreErrorFunc provides a way to filter errors during the Bulk.Run.  If this function returns
+// true the error will NOT be added to the slice of errors returned by Bulk.Run.
+//
+// This may be used in conjunction with
+// BulkAction.WithMessageAndPrefix if you are reporting some errors as warnings.
+type IgnoreErrorFunc func(e error) bool
+
 // Bulk provides helpers for iterating over a list of items
 type Bulk struct {
 	Mapper Mapper
 
-	Op    OpFunc
-	After AfterFunc
-	Retry RetryFunc
+	Op          OpFunc
+	After       AfterFunc
+	Retry       RetryFunc
+	IgnoreError IgnoreErrorFunc
 }
 
 // Create attempts to create each item generically, gathering all errors in the
@@ -52,6 +60,10 @@ func (b *Bulk) Run(list *kapi.List, namespace string) []error {
 	if after == nil {
 		after = func(*resource.Info, error) bool { return false }
 	}
+	ignoreError := b.IgnoreError
+	if ignoreError == nil {
+		ignoreError = func(e error) bool { return false }
+	}
 
 	errs := []error{}
 	for i, item := range list.Items {
@@ -70,7 +82,9 @@ func (b *Bulk) Run(list *kapi.List, namespace string) []error {
 			}
 		}
 		if err != nil {
-			errs = append(errs, err)
+			if !ignoreError(err) {
+				errs = append(errs, err)
+			}
 			if after(info, err) {
 				break
 			}
@@ -85,22 +99,22 @@ func (b *Bulk) Run(list *kapi.List, namespace string) []error {
 	return errs
 }
 
-func NewPrintNameOrErrorAfterIndent(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer, dryRun bool, indent string) AfterFunc {
+func NewPrintNameOrErrorAfterIndent(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer, dryRun bool, indent string, prefixForError PrefixForError) AfterFunc {
 	return func(info *resource.Info, err error) bool {
 		if err == nil {
 			fmt.Fprintf(out, indent)
 			cmdutil.PrintSuccess(mapper, short, out, info.Mapping.Resource, info.Name, dryRun, operation)
 		} else {
-			fmt.Fprintf(errs, "%serror: %v\n", indent, err)
+			fmt.Fprintf(errs, "%s%s: %v\n", indent, prefixForError(err), err)
 		}
 		return false
 	}
 }
 
-func NewPrintErrorAfter(mapper meta.RESTMapper, errs io.Writer) func(*resource.Info, error) bool {
+func NewPrintErrorAfter(mapper meta.RESTMapper, errs io.Writer, prefixForError PrefixForError) func(*resource.Info, error) bool {
 	return func(info *resource.Info, err error) bool {
 		if err != nil {
-			fmt.Fprintf(errs, "error: %v\n", err)
+			fmt.Fprintf(errs, "%s: %v\n", prefixForError(err), err)
 		}
 		return false
 	}
@@ -186,24 +200,31 @@ func (b *BulkAction) DefaultIndent() string {
 	return ""
 }
 
-func (b BulkAction) WithMessage(action, individual string) Runner {
+// PrefixForError allows customization of the prefix that will be printed for any error that occurs in the BulkAction.
+type PrefixForError func(e error) string
+
+func (b BulkAction) WithMessageAndPrefix(action, individual string, prefixForError PrefixForError) Runner {
 	b.Action = action
 	switch {
 	// TODO: this should be b printer
 	case b.Output == "":
-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, false, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent())
+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, false, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
 	// TODO: needs to be unified with the name printer (incremental vs exact execution), possibly by creating b synthetic printer?
 	case b.Output == "name":
-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, true, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent())
+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, true, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent(), prefixForError)
 	default:
-		b.Bulk.After = NewPrintErrorAfter(b.Bulk.Mapper, b.ErrOut)
+		b.Bulk.After = NewPrintErrorAfter(b.Bulk.Mapper, b.ErrOut, prefixForError)
 		if b.StopOnError {
 			b.Bulk.After = HaltOnError(b.Bulk.After)
 		}
 	}
 	return &b
 }
 
+func (b BulkAction) WithMessage(action, individual string) Runner {
+	return b.WithMessageAndPrefix(action, individual, func(e error) string { return "error" })
+}
+
 func (b *BulkAction) Run(list *kapi.List, namespace string) []error {
 	run := b.Bulk