msb-public
/
helm
mirror of https://github.com/helm/helm
1
0
Code Issues Projects Releases Wiki Activity

Use fmt.printf() to end with a newline

Browse Source 
Signed-off-by: xichengliudui <1693291525@qq.com>
pull/5598/head
xichengliudui 7 years ago
parent 8494d133bf
commit 090d64d14a
10 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File

2
cmd/rudder/rudder.go
Unescape View File

@ -93,7 +93,7 @@ func (r *ReleaseModuleServiceServer) InstallRelease(ctx context.Context, in *rud
b := bytes.NewBufferString(in.Release.Manifest) b := bytes.NewBufferString(in.Release.Manifest)
err := kubeClient.Create(in.Release.Namespace, b, 500, false) err := kubeClient.Create(in.Release.Namespace, b, 500, false)
if err != nil { if err != nil {
grpclog.Printf("error when creating release: %v", err) grpclog.Printf("error when creating release: %v\n", err)
} }
return &rudderAPI.InstallReleaseResponse{}, err return &rudderAPI.InstallReleaseResponse{}, err
} }

14
cmd/tiller/tiller.go
Unescape View File

@ -185,11 +185,11 @@ func start() {
logger.Fatalf("Server died: %s", err) logger.Fatalf("Server died: %s", err)
} }
logger.Printf("Starting Tiller %s (tls=%t)", version.GetVersion(), *tlsEnable || *tlsVerify) logger.Printf("Starting Tiller %s (tls=%t)\n", version.GetVersion(), *tlsEnable || *tlsVerify)
logger.Printf("GRPC listening on %s", *grpcAddr) logger.Printf("GRPC listening on %s\n", *grpcAddr)
logger.Printf("Probes listening on %s", *probeAddr) logger.Printf("Probes listening on %s\n", *probeAddr)
logger.Printf("Storage driver is %s", env.Releases.Name()) logger.Printf("Storage driver is %s\n", env.Releases.Name())
logger.Printf("Max history per release is %d", *maxHistory) logger.Printf("Max history per release is %d\n", *maxHistory)
if *enableTracing { if *enableTracing {
startTracing(traceAddr) startTracing(traceAddr)
@ -224,7 +224,7 @@ func start() {
case err := <-srvErrCh: case err := <-srvErrCh:
logger.Fatalf("Server died: %s", err) logger.Fatalf("Server died: %s", err)
case err := <-probeErrCh: 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) ret, err := strconv.Atoi(val)
if err != nil { 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 defaultMaxHistory
} }
return ret return ret

10
pkg/chartutil/requirements.go
Unescape View File

@ -153,11 +153,11 @@ func ProcessRequirementsConditions(reqs *Requirements, cvals Values) {
hasFalse = true hasFalse = true
} }
} else { } 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 { } else if _, ok := err.(ErrNoValue); !ok {
// this is a real error // 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 { if vv != nil {
@ -203,7 +203,7 @@ func ProcessRequirementsTags(reqs *Requirements, cvals Values) {
hasFalse = true hasFalse = true
} }
} else { } 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 // get child table
vv, err := cvals.Table(s) vv, err := cvals.Table(s)
if err != nil { if err != nil {
log.Printf("Warning: ImportValues missing table: %v", err) log.Printf("Warning: ImportValues missing table: %v\n", err)
continue continue
} }
// create value map from child to be merged into parent // create value map from child to be merged into parent
@ -438,7 +438,7 @@ func processImportValues(c *chart.Chart) error {
s := name + "." + nm["child"] s := name + "." + nm["child"]
vm, err := cvals.Table(s) vm, err := cvals.Table(s)
if err != nil { if err != nil {
log.Printf("Warning: ImportValues missing table: %v", err) log.Printf("Warning: ImportValues missing table: %v\n", err)
continue continue
} }
b = coalesceTables(b, vm.AsMap(), c.Metadata.Name) b = coalesceTables(b, vm.AsMap(), c.Metadata.Name)

14
pkg/chartutil/values.go
Unescape View File

@ -225,14 +225,14 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str
if destglob, ok := dest[GlobalKey]; !ok { if destglob, ok := dest[GlobalKey]; !ok {
dg = map[string]interface{}{} dg = map[string]interface{}{}
} else if dg, ok = destglob.(map[string]interface{}); !ok { } 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 return dg
} }
if srcglob, ok := src[GlobalKey]; !ok { if srcglob, ok := src[GlobalKey]; !ok {
sg = map[string]interface{}{} sg = map[string]interface{}{}
} else if sg, ok = srcglob.(map[string]interface{}); !ok { } 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 return dg
} }
@ -251,7 +251,7 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str
dg[key] = vv dg[key] = vv
continue continue
} else { } 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 { } else {
// Here there is no merge. We're just adding. // 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) { } else if dv, ok := dg[key]; ok && istable(dv) {
// It's not clear if this condition can actually ever trigger. // 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 continue
} }
// TODO: Do we need to do any additional checking on the value? // 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]. // if v[key] is a table, merge nv's val table into v[key].
src, ok := val.(map[string]interface{}) src, ok := val.(map[string]interface{})
if !ok { 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 continue
} }
// Because v has higher precedence than nv, dest values override src // 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) { } else if istable(innerdst) {
coalesceTables(innerdst.(map[string]interface{}), val.(map[string]interface{}), chartName) coalesceTables(innerdst.(map[string]interface{}), val.(map[string]interface{}), chartName)
} else { } 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 continue
} else if dv, ok := dst[key]; ok && istable(dv) { } 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 continue
} else if !ok { // <- ok is still in scope from preceding conditional. } else if !ok { // <- ok is still in scope from preceding conditional.
dst[key] = val dst[key] = val

4
pkg/engine/engine.go
Unescape View File

@ -158,7 +158,7 @@ func (e *Engine) alterFuncMap(t *template.Template, referenceTpls map[string]ren
if val == nil { if val == nil {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // 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 return "", nil
} }
// Convert nil to "" in case required is piped into other functions // 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 val == "" {
if e.LintMode { if e.LintMode {
// Don't fail on missing required values when linting // 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, nil
} }
return val, fmt.Errorf(warn) return val, fmt.Errorf(warn)

8
pkg/ignore/rules.go
Unescape View File

@ -95,7 +95,7 @@ func (r *Rules) Ignore(path string, fi os.FileInfo) bool {
} }
for _, p := range r.patterns { for _, p := range r.patterns {
if p.match == nil { 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 return false
} }
@ -170,7 +170,7 @@ func (r *Rules) parseRule(rule string) error {
rule = strings.TrimPrefix(rule, "/") rule = strings.TrimPrefix(rule, "/")
ok, err := filepath.Match(rule, n) ok, err := filepath.Match(rule, n)
if err != nil { 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 false
} }
return ok return ok
@ -180,7 +180,7 @@ func (r *Rules) parseRule(rule string) error {
p.match = func(n string, fi os.FileInfo) bool { p.match = func(n string, fi os.FileInfo) bool {
ok, err := filepath.Match(rule, n) ok, err := filepath.Match(rule, n)
if err != nil { 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 false
} }
return ok return ok
@ -192,7 +192,7 @@ func (r *Rules) parseRule(rule string) error {
n = filepath.Base(n) n = filepath.Base(n)
ok, err := filepath.Match(rule, n) ok, err := filepath.Match(rule, n)
if err != nil { 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 false
} }
return ok return ok

4
pkg/kube/client.go
Unescape View File

@ -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) obj, err := helper.Patch(target.Namespace, target.Name, patchType, patch, nil)
if err != nil { if err != nil {
kind := target.Mapping.GroupVersionKind.Kind 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 { if force {
// Attempt to delete... // Attempt to delete...
if err := deleteResource(target); err != nil { if err := deleteResource(target); err != nil {
return err return err
} }
log.Printf("Deleted %s: %q", kind, target.Name) log.Printf("Deleted %s: %q\n", kind, target.Name)
// ... and recreate // ... and recreate
if err := createResource(target); err != nil { if err := createResource(target); err != nil {

6
pkg/tiller/hooks.go
Unescape View File

@ -88,7 +88,7 @@ func sortManifests(files map[string]string, apis chartutil.VersionSet, sort Sort
} }
// Skip empty files and log this. // Skip empty files and log this.
if len(strings.TrimSpace(c)) == 0 { 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 continue
} }
@ -178,7 +178,7 @@ func (file *manifestFile) sort(result *result) error {
} }
if isUnknownHook { if isUnknownHook {
log.Printf("info: skipping unknown hook: %q", hookTypes) log.Printf("info: skipping unknown hook: %q\n", hookTypes)
continue continue
} }
@ -189,7 +189,7 @@ func (file *manifestFile) sort(result *result) error {
if exist { if exist {
h.DeletePolicies = append(h.DeletePolicies, policy) h.DeletePolicies = append(h.DeletePolicies, policy)
} else { } else {
log.Printf("info: skipping unknown hook delete policy: %q", value) log.Printf("info: skipping unknown hook delete policy: %q\n", value)
} }
}) })
} }

2
pkg/tiller/release_install.go
Unescape View File

@ -168,7 +168,7 @@ func (s *ReleaseServer) performRelease(r *release.Release, req *services.Install
// crd-install hooks // crd-install hooks
if !req.DisableHooks && !req.DisableCrdHook { if !req.DisableHooks && !req.DisableCrdHook {
if err := s.execHook(r.Hooks, r.Name, r.Namespace, hooks.CRDInstall, req.Timeout); err != nil { 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 return res, err
} }
} else { } else {

2
pkg/tiller/release_modules.go
Unescape View File

@ -182,7 +182,7 @@ func DeleteRelease(rel *release.Release, vs chartutil.VersionSet, kubeClient env
continue continue
} }
if err := kubeClient.Delete(rel.Namespace, b); err != nil { 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 { if err == kube.ErrNoObjectsVisited {
// Rewrite the message from "no objects visited" // Rewrite the message from "no objects visited"
obj := "" obj := ""

Write Preview
Loading…
Cancel
Save