From b5969570cad6c2e9723ba8a5a048806e4264c43f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Chris=20Suszy=C5=84ski?= Date: Wed, 6 Dec 2023 20:46:48 +0100 Subject: [PATCH] Streamline logging --- .../pkg/codegen/helpers/generator.go | 4 +-- .../pkg/codegen/helpers/generic.go | 10 +++++-- .../src/k8s.io/code-generator/pkg/flags.go | 28 ------------------- .../code-generator/pkg/osbin/git/find.go | 2 +- .../code-generator/pkg/osbin/git/grep.go | 2 +- .../pkg/osbin/golang/packageof.go | 1 + 6 files changed, 13 insertions(+), 34 deletions(-) delete mode 100644 staging/src/k8s.io/code-generator/pkg/flags.go diff --git a/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generator.go b/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generator.go index 4674cde3b95ff..5dee95e73c42a 100644 --- a/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generator.go +++ b/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generator.go @@ -28,8 +28,8 @@ func (g *Generator) Generate(args *Args) error { if err := os.MkdirAll(args.root, 0x755); err != nil { return err } - klog.V(2).Infof("Generating helpers for %s in %s", - args.InputPkgRoot, args.root) + klog.V(1).Infof("Generating helpers for %s", args.InputPkgRoot) + klog.V(2).Infof("Helpers generator config %#v", args) if err := generateDeepCopy(args); err != nil { return err diff --git a/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generic.go b/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generic.go index de70f02d06922..7a5fe261f7323 100644 --- a/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generic.go +++ b/staging/src/k8s.io/code-generator/pkg/codegen/helpers/generic.go @@ -71,7 +71,13 @@ func generateGen(args *Args, gc genConf) error { return err } } - return generatePackages(args, gc, pkgs) + if err := generatePackages(args, gc, pkgs); err != nil { + return err + } + + klog.V(2).Infof("%s-gen completed successfully", gc.name) + + return nil } func collectPackages(args *Args, conf genConf) ([]string, error) { @@ -141,7 +147,7 @@ func generatePackages(args *Args, gc genConf, pkgs []string) error { genName := gc.name + "-gen" fs := pflag.NewFlagSet(genName, pflag.ContinueOnError) fs.AddGoFlagSet(goflag.CommandLine) // make sure we get the klog flags - klog.V(2).Infof("Running %s with args %q", + klog.V(3).Infof("Running %s with args %q", genName, dcargs) return withinDirectory(args.root, func() error { return asBinary(genName, func() error { diff --git a/staging/src/k8s.io/code-generator/pkg/flags.go b/staging/src/k8s.io/code-generator/pkg/flags.go deleted file mode 100644 index 0ef775ffaf368..0000000000000 --- a/staging/src/k8s.io/code-generator/pkg/flags.go +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright 2023 The Kubernetes Authors. - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except In compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to In writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -package pkg - -import "os" - -// Verbose returns the value of the KUBE_VERBOSE environment variable. -func Verbose() string { - v := os.Getenv("KUBE_VERBOSE") - if v == "" { - v = "0" - } - return v -} diff --git a/staging/src/k8s.io/code-generator/pkg/osbin/git/find.go b/staging/src/k8s.io/code-generator/pkg/osbin/git/find.go index 476b2e1f9ad39..0394ce69eee0a 100644 --- a/staging/src/k8s.io/code-generator/pkg/osbin/git/find.go +++ b/staging/src/k8s.io/code-generator/pkg/osbin/git/find.go @@ -55,7 +55,7 @@ func Find(pathspec string, opts ...FindOpt) ([]string, error) { cmd.Stderr = o.Err } cmd.Env = append(os.Environ(), "LANG=C.UTF-8") - klog.V(2).Infof("Running: %q", cmd) + klog.V(3).Infof("Running: %q", cmd) out, err := cmd.Output() if err != nil { return nil, err diff --git a/staging/src/k8s.io/code-generator/pkg/osbin/git/grep.go b/staging/src/k8s.io/code-generator/pkg/osbin/git/grep.go index fba7fb62311c8..264efab2d9822 100644 --- a/staging/src/k8s.io/code-generator/pkg/osbin/git/grep.go +++ b/staging/src/k8s.io/code-generator/pkg/osbin/git/grep.go @@ -63,7 +63,7 @@ func Grep(pattern, pathspec string, opts ...GrepOpt) ([]string, error) { cmd.Stderr = o.Err } cmd.Env = append(os.Environ(), "LANG=C.UTF-8") - klog.V(2).Infof("Running: %q", cmd) + klog.V(3).Infof("Running: %q", cmd) out, err := cmd.Output() if err != nil { return nil, err diff --git a/staging/src/k8s.io/code-generator/pkg/osbin/golang/packageof.go b/staging/src/k8s.io/code-generator/pkg/osbin/golang/packageof.go index 2ac021858988c..62f2ff4a843d1 100644 --- a/staging/src/k8s.io/code-generator/pkg/osbin/golang/packageof.go +++ b/staging/src/k8s.io/code-generator/pkg/osbin/golang/packageof.go @@ -30,6 +30,7 @@ import ( func PackageOf(path string) (string, error) { c := exec.Command("go", "list", "-find", path) c.Env = append(os.Environ(), "GO111MODULE=on") + klog.V(3).Infof("Running: %q", c) out, err := c.Output() if err != nil { var exitErr *exec.ExitError