Merge pull request #3330 from maqiuyujoyce/202412-enable-klog

Enable klog in dynamic test

go.mod

@@ -1,6 +1,6 @@
 module github.com/GoogleCloudPlatform/k8s-config-connector
 
-go 1.22
+go 1.22.0
 
 toolchain go1.23.2
 
@@ -224,12 +224,12 @@ require (
 	go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
 	go.uber.org/multierr v1.10.0 // indirect
 	golang.org/x/crypto v0.29.0 // indirect
-	golang.org/x/mod v0.20.0 // indirect
+	golang.org/x/mod v0.22.0 // indirect
 	golang.org/x/net v0.31.0 // indirect
 	golang.org/x/sys v0.27.0 // indirect
 	golang.org/x/term v0.26.0 // indirect
 	golang.org/x/text v0.20.0 // indirect
-	golang.org/x/tools v0.24.0 // indirect
+	golang.org/x/tools v0.27.0 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
 	google.golang.org/appengine v1.6.8 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect

pkg/test/main/testmain.go

@@ -15,6 +15,7 @@
 package testmain
 
 import (
+	"flag"
 	"io"
 	"log"
 	"os"
@@ -29,6 +30,7 @@ import (
 	cnrmwebhook "github.com/GoogleCloudPlatform/k8s-config-connector/pkg/webhook"
 
 	apiextensions "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
+	"k8s.io/klog/v2"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
 	"sigs.k8s.io/controller-runtime/pkg/manager"
 )
@@ -42,7 +44,26 @@ func ForIntegrationTests(m *testing.M, mgr *manager.Manager) {
 	// here we discard everything logged onto the Go standard logger to
 	// disable logging from Terraform Google provider in integration tests.
 	log.SetOutput(io.Discard)
+	if err := flag.Set("alsologtostderr", "true"); err != nil {
+		log.Fatalf("error setting alsologtostderr to true: %v", err)
+	}
+	flag.Parse()
+
+	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
+	klog.InitFlags(klogFlags)
+
+	// Sync the log and klog flags.
+	flag.CommandLine.VisitAll(func(f1 *flag.Flag) {
+		f2 := klogFlags.Lookup(f1.Name)
+		if f2 != nil {
+			value := f1.Value.String()
+			if err := f2.Value.Set(value); err != nil {
+				log.Fatalf("error setting %v to %v: %v", f2, value, err)
+			}
+		}
+	})
 	TestMain(m, test.IntegrationTestType, nil, mgr)
+	klog.Flush()
 }
 
 func ForUnitTests(m *testing.M, mgr *manager.Manager) {