From 090d64d14ac8330244de202bd405b2a8325fb0eb Mon Sep 17 00:00:00 2001 From: xichengliudui <1693291525@qq.com> Date: Wed, 10 Apr 2019 15:33:13 -0400 Subject: [PATCH] Use fmt.printf() to end with a newline Signed-off-by: xichengliudui <1693291525@qq.com> --- cmd/rudder/rudder.go | 2 +- cmd/tiller/tiller.go | 14 +++++++------- pkg/chartutil/requirements.go | 10 +++++----- pkg/chartutil/values.go | 14 +++++++------- pkg/engine/engine.go | 4 ++-- pkg/ignore/rules.go | 8 ++++---- pkg/kube/client.go | 4 ++-- pkg/tiller/hooks.go | 6 +++--- pkg/tiller/release_install.go | 2 +- pkg/tiller/release_modules.go | 2 +- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/cmd/rudder/rudder.go b/cmd/rudder/rudder.go index d68daf453..2b6c85110 100644 --- a/cmd/rudder/rudder.go +++ b/cmd/rudder/rudder.go @@ -93,7 +93,7 @@ func (r *ReleaseModuleServiceServer) InstallRelease(ctx context.Context, in *rud b := bytes.NewBufferString(in.Release.Manifest) err := kubeClient.Create(in.Release.Namespace, b, 500, false) if err != nil { - grpclog.Printf("error when creating release: %v", err) + grpclog.Printf("error when creating release: %v\n", err) } return &rudderAPI.InstallReleaseResponse{}, err } diff --git a/cmd/tiller/tiller.go b/cmd/tiller/tiller.go index f3ba197b5..95aa515d2 100644 --- a/cmd/tiller/tiller.go +++ b/cmd/tiller/tiller.go @@ -185,11 +185,11 @@ func start() { logger.Fatalf("Server died: %s", err) } - logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify) - logger.Printf("GRPC listening on %s", *grpcAddr) - logger.Printf("Probes listening on %s", *probeAddr) - logger.Printf("Storage driver is %s", env.Releases.Name()) - logger.Printf("Max history per release is %d", *maxHistory) + logger.Printf("Starting Tiller %s (tls=%t)\n", version.GetVersion(), *tlsEnable || *tlsVerify) + logger.Printf("GRPC listening on %s\n", *grpcAddr) + logger.Printf("Probes listening on %s\n", *probeAddr) + logger.Printf("Storage driver is %s\n", env.Releases.Name()) + logger.Printf("Max history per release is %d\n", *maxHistory) if *enableTracing { startTracing(traceAddr) @@ -224,7 +224,7 @@ func start() { case err := <-srvErrCh: logger.Fatalf("Server died: %s", err) case err := <-probeErrCh: - logger.Printf("Probes server died: %s", err) + logger.Printf("Probes server died: %s\n", err) } } @@ -283,7 +283,7 @@ func historyMaxFromEnv() int { } ret, err := strconv.Atoi(val) if err != nil { - log.Printf("Invalid max history %q. Defaulting to 0.", val) + log.Printf("Invalid max history %q. Defaulting to 0.\n", val) return defaultMaxHistory } return ret diff --git a/pkg/chartutil/requirements.go b/pkg/chartutil/requirements.go index f21a22005..818e149ae 100644 --- a/pkg/chartutil/requirements.go +++ b/pkg/chartutil/requirements.go @@ -153,11 +153,11 @@ func ProcessRequirementsConditions(reqs *Requirements, cvals Values) { hasFalse = true } } else { - log.Printf("Warning: Condition path '%s' for chart %s returned non-bool value", c, r.Name) + log.Printf("Warning: Condition path '%s' for chart %s returned non-bool value\n", c, r.Name) } } else if _, ok := err.(ErrNoValue); !ok { // this is a real error - log.Printf("Warning: PathValue returned error %v", err) + log.Printf("Warning: PathValue returned error %v\n", err) } if vv != nil { @@ -203,7 +203,7 @@ func ProcessRequirementsTags(reqs *Requirements, cvals Values) { hasFalse = true } } else { - log.Printf("Warning: Tag '%s' for chart %s returned non-bool value", k, r.Name) + log.Printf("Warning: Tag '%s' for chart %s returned non-bool value\n", k, r.Name) } } } @@ -423,7 +423,7 @@ func processImportValues(c *chart.Chart) error { // get child table vv, err := cvals.Table(s) if err != nil { - log.Printf("Warning: ImportValues missing table: %v", err) + log.Printf("Warning: ImportValues missing table: %v\n", err) continue } // create value map from child to be merged into parent @@ -438,7 +438,7 @@ func processImportValues(c *chart.Chart) error { s := name + "." + nm["child"] vm, err := cvals.Table(s) if err != nil { - log.Printf("Warning: ImportValues missing table: %v", err) + log.Printf("Warning: ImportValues missing table: %v\n", err) continue } b = coalesceTables(b, vm.AsMap(), c.Metadata.Name) diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go index 352524c13..052eeb47d 100644 --- a/pkg/chartutil/values.go +++ b/pkg/chartutil/values.go @@ -225,14 +225,14 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str if destglob, ok := dest[GlobalKey]; !ok { dg = map[string]interface{}{} } else if dg, ok = destglob.(map[string]interface{}); !ok { - log.Printf("Warning: Skipping globals for chart '%s' because destination '%s' is not a table.", chartName, GlobalKey) + log.Printf("Warning: Skipping globals for chart '%s' because destination '%s' is not a table.\n", chartName, GlobalKey) return dg } if srcglob, ok := src[GlobalKey]; !ok { sg = map[string]interface{}{} } else if sg, ok = srcglob.(map[string]interface{}); !ok { - log.Printf("Warning: skipping globals for chart '%s' because source '%s' is not a table.", chartName, GlobalKey) + log.Printf("Warning: skipping globals for chart '%s' because source '%s' is not a table.\n", chartName, GlobalKey) return dg } @@ -251,7 +251,7 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str dg[key] = vv continue } else { - log.Printf("Warning: For chart '%s', cannot merge map onto non-map for key '%q'. Skipping.", chartName, key) + log.Printf("Warning: For chart '%s', cannot merge map onto non-map for key '%q'. Skipping.\n", chartName, key) } } else { // Here there is no merge. We're just adding. @@ -259,7 +259,7 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str } } else if dv, ok := dg[key]; ok && istable(dv) { // It's not clear if this condition can actually ever trigger. - log.Printf("Warning: For chart '%s', key '%s' is a table. Skipping.", chartName, key) + log.Printf("Warning: For chart '%s', key '%s' is a table. Skipping.\n", chartName, key) continue } // TODO: Do we need to do any additional checking on the value? @@ -305,7 +305,7 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interf // if v[key] is a table, merge nv's val table into v[key]. src, ok := val.(map[string]interface{}) if !ok { - log.Printf("Warning: Building values map for chart '%s'. Skipped value (%+v) for '%s', as it is not a table.", c.Metadata.Name, src, key) + log.Printf("Warning: Building values map for chart '%s'. Skipped value (%+v) for '%s', as it is not a table.\n", c.Metadata.Name, src, key) continue } // Because v has higher precedence than nv, dest values override src @@ -333,11 +333,11 @@ func coalesceTables(dst, src map[string]interface{}, chartName string) map[strin } else if istable(innerdst) { coalesceTables(innerdst.(map[string]interface{}), val.(map[string]interface{}), chartName) } else { - log.Printf("Warning: Merging destination map for chart '%s'. Cannot overwrite table item '%s', with non table value: %v", chartName, key, val) + log.Printf("Warning: Merging destination map for chart '%s'. Cannot overwrite table item '%s', with non table value: %v\n", chartName, key, val) } continue } else if dv, ok := dst[key]; ok && istable(dv) { - log.Printf("Warning: Merging destination map for chart '%s'. The destination item '%s' is a table and ignoring the source '%s' as it has a non-table value of: %v", chartName, key, key, val) + log.Printf("Warning: Merging destination map for chart '%s'. The destination item '%s' is a table and ignoring the source '%s' as it has a non-table value of: %v\n", chartName, key, key, val) continue } else if !ok { // <- ok is still in scope from preceding conditional. dst[key] = val diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go index 9a155de2e..282a8a322 100644 --- a/pkg/engine/engine.go +++ b/pkg/engine/engine.go @@ -158,7 +158,7 @@ func (e *Engine) alterFuncMap(t *template.Template, referenceTpls map[string]ren if val == nil { if e.LintMode { // Don't fail on missing required values when linting - log.Printf("[INFO] Missing required value: %s", warn) + log.Printf("[INFO] Missing required value: %s\n", warn) return "", nil } // Convert nil to "" in case required is piped into other functions @@ -167,7 +167,7 @@ func (e *Engine) alterFuncMap(t *template.Template, referenceTpls map[string]ren if val == "" { if e.LintMode { // Don't fail on missing required values when linting - log.Printf("[INFO] Missing required value: %s", warn) + log.Printf("[INFO] Missing required value: %s\n", warn) return val, nil } return val, fmt.Errorf(warn) diff --git a/pkg/ignore/rules.go b/pkg/ignore/rules.go index 9a8e08327..ebd9345bc 100644 --- a/pkg/ignore/rules.go +++ b/pkg/ignore/rules.go @@ -95,7 +95,7 @@ func (r *Rules) Ignore(path string, fi os.FileInfo) bool { } for _, p := range r.patterns { if p.match == nil { - log.Printf("ignore: no matcher supplied for %q", p.raw) + log.Printf("ignore: no matcher supplied for %q\n", p.raw) return false } @@ -170,7 +170,7 @@ func (r *Rules) parseRule(rule string) error { rule = strings.TrimPrefix(rule, "/") ok, err := filepath.Match(rule, n) if err != nil { - log.Printf("Failed to compile %q: %s", rule, err) + log.Printf("Failed to compile %q: %s\n", rule, err) return false } return ok @@ -180,7 +180,7 @@ func (r *Rules) parseRule(rule string) error { p.match = func(n string, fi os.FileInfo) bool { ok, err := filepath.Match(rule, n) if err != nil { - log.Printf("Failed to compile %q: %s", rule, err) + log.Printf("Failed to compile %q: %s\n", rule, err) return false } return ok @@ -192,7 +192,7 @@ func (r *Rules) parseRule(rule string) error { n = filepath.Base(n) ok, err := filepath.Match(rule, n) if err != nil { - log.Printf("Failed to compile %q: %s", rule, err) + log.Printf("Failed to compile %q: %s\n", rule, err) return false } return ok diff --git a/pkg/kube/client.go b/pkg/kube/client.go index e1101667d..5920100cd 100644 --- a/pkg/kube/client.go +++ b/pkg/kube/client.go @@ -575,14 +575,14 @@ func updateResource(c *Client, target *resource.Info, currentObj runtime.Object, obj, err := helper.Patch(target.Namespace, target.Name, patchType, patch, nil) if err != nil { kind := target.Mapping.GroupVersionKind.Kind - log.Printf("Cannot patch %s: %q (%v)", kind, target.Name, err) + log.Printf("Cannot patch %s: %q (%v)\n", kind, target.Name, err) if force { // Attempt to delete... if err := deleteResource(target); err != nil { return err } - log.Printf("Deleted %s: %q", kind, target.Name) + log.Printf("Deleted %s: %q\n", kind, target.Name) // ... and recreate if err := createResource(target); err != nil { diff --git a/pkg/tiller/hooks.go b/pkg/tiller/hooks.go index 0fb7c92f8..5b0a771c6 100644 --- a/pkg/tiller/hooks.go +++ b/pkg/tiller/hooks.go @@ -88,7 +88,7 @@ func sortManifests(files map[string]string, apis chartutil.VersionSet, sort Sort } // Skip empty files and log this. if len(strings.TrimSpace(c)) == 0 { - log.Printf("info: manifest %q is empty. Skipping.", filePath) + log.Printf("info: manifest %q is empty. Skipping.\n", filePath) continue } @@ -178,7 +178,7 @@ func (file *manifestFile) sort(result *result) error { } if isUnknownHook { - log.Printf("info: skipping unknown hook: %q", hookTypes) + log.Printf("info: skipping unknown hook: %q\n", hookTypes) continue } @@ -189,7 +189,7 @@ func (file *manifestFile) sort(result *result) error { if exist { h.DeletePolicies = append(h.DeletePolicies, policy) } else { - log.Printf("info: skipping unknown hook delete policy: %q", value) + log.Printf("info: skipping unknown hook delete policy: %q\n", value) } }) } diff --git a/pkg/tiller/release_install.go b/pkg/tiller/release_install.go index 3cfbcf30e..d1cd806f4 100644 --- a/pkg/tiller/release_install.go +++ b/pkg/tiller/release_install.go @@ -168,7 +168,7 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *services.Install // crd-install hooks if !req.DisableHooks && !req.DisableCrdHook { if err := s.execHook(r.Hooks, r.Name, r.Namespace, hooks.CRDInstall, req.Timeout); err != nil { - fmt.Printf("Finished installing CRD: %s", err) + fmt.Printf("Finished installing CRD: %s\n", err) return res, err } } else { diff --git a/pkg/tiller/release_modules.go b/pkg/tiller/release_modules.go index 360794481..d2ce4c937 100644 --- a/pkg/tiller/release_modules.go +++ b/pkg/tiller/release_modules.go @@ -182,7 +182,7 @@ func DeleteRelease(rel *release.Release, vs chartutil.VersionSet, kubeClient env continue } if err := kubeClient.Delete(rel.Namespace, b); err != nil { - log.Printf("uninstall: Failed deletion of %q: %s", rel.Name, err) + log.Printf("uninstall: Failed deletion of %q: %s\n", rel.Name, err) if err == kube.ErrNoObjectsVisited { // Rewrite the message from "no objects visited" obj := ""