Streamline logging

kubernetes · Jan 19, 2024 · b596957 · b596957
1 parent 5b524d1
commit b596957
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 34 deletions.
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
@@ -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
@@ -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
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
@@ -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
@@ -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
@@ -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