Merge pull request #1746 from gauravkghildiyal/contextLogging

Configure contextual and structured logging for NEG controller
kubernetes · Jul 29, 2022 · c577834 · c577834
2 parents 704f60d + 149e5e1
commit c577834
Show file tree

Hide file tree

Showing 158 changed files with 2,659 additions and 2,790 deletions.
diff --git a/cmd/404-server-with-metrics/server-with-metrics.go b/cmd/404-server-with-metrics/server-with-metrics.go
@@ -28,7 +28,7 @@ import (
 	"runtime"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"

diff --git a/cmd/e2e-test/cdn_test.go b/cmd/e2e-test/cdn_test.go
@@ -34,7 +34,7 @@ import (
 	"k8s.io/ingress-gce/pkg/fuzz"
 	"k8s.io/ingress-gce/pkg/fuzz/features"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // TestCDN is for ingress versions before the CDN config was expanded

diff --git a/cmd/e2e-test/main_test.go b/cmd/e2e-test/main_test.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/ingress-gce/pkg/e2e"
 	_ "k8s.io/ingress-gce/pkg/klog"
 	"k8s.io/ingress-gce/pkg/version"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	// Pull in the auth library for GCP.
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

diff --git a/cmd/echo/app/handlers.go b/cmd/echo/app/handlers.go
@@ -27,7 +27,7 @@ import (
 	"time"
 
 	"k8s.io/ingress-gce/pkg/version"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/cmd/echo/app/tls.go b/cmd/echo/app/tls.go
@@ -27,7 +27,7 @@ import (
 	"math/big"
 	"time"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // createCert creates a certificate and key in temporary files and returns their paths.

diff --git a/cmd/echo/main.go b/cmd/echo/main.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-gce/cmd/echo/app"
 	_ "k8s.io/ingress-gce/pkg/klog"
 	"k8s.io/ingress-gce/pkg/version"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func main() {

diff --git a/cmd/glbc/app/clients.go b/cmd/glbc/app/clients.go
@@ -27,7 +27,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	cloudprovider "k8s.io/cloud-provider"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 
 	// Register the GCP authorization provider.

diff --git a/cmd/glbc/app/handlers.go b/cmd/glbc/app/handlers.go
@@ -27,7 +27,7 @@ import (
 	"syscall"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"k8s.io/ingress-gce/pkg/context"
 	"k8s.io/ingress-gce/pkg/controller"

diff --git a/cmd/glbc/app/init.go b/cmd/glbc/app/init.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/ingress-gce/pkg/flags"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // DefaultBackendServicePort returns the ServicePort which will be

diff --git a/cmd/glbc/app/namer.go b/cmd/glbc/app/namer.go
@@ -23,7 +23,7 @@ import (
 	"time"
 
 	"k8s.io/ingress-gce/pkg/utils/namer"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/labels"

diff --git a/cmd/glbc/main.go b/cmd/glbc/main.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-gce/pkg/psc"
 	"k8s.io/ingress-gce/pkg/serviceattachment"
 	"k8s.io/ingress-gce/pkg/svcneg"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	crdclient "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset"
 	"k8s.io/client-go/kubernetes"
@@ -340,6 +340,7 @@ func runControllers(ctx *ingctx.ControllerContext) {
 		enableAsm,
 		asmServiceNEGSkipNamespaces,
 		flags.F.EnableEndpointSlices,
+		klog.TODO(), // TODO(#1761): Replace this with a top level logger configuration once one is available.
 	)
 
 	ctx.AddHealthCheck("neg-controller", negController.IsHealthy)

diff --git a/cmd/workload-controller/app/client.go b/cmd/workload-controller/app/client.go
@@ -20,7 +20,7 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/ingress-gce/pkg/flags"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	// Register the GCP authorization provider.
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

diff --git a/cmd/workload-controller/main.go b/cmd/workload-controller/main.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/ingress-gce/pkg/flags"
 	_ "k8s.io/ingress-gce/pkg/klog"
 	"k8s.io/ingress-gce/pkg/version"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func main() {

diff --git a/cmd/workload-daemon/main.go b/cmd/workload-daemon/main.go
@@ -24,7 +24,7 @@ import (
 
 	daemon "k8s.io/ingress-gce/pkg/experimental/workload/daemon"
 	gce "k8s.io/ingress-gce/pkg/experimental/workload/daemon/provider/gce"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	// GCP Authentication
 	_ "k8s.io/client-go/plugin/pkg/client/auth/gcp"

diff --git a/go.mod b/go.mod
@@ -24,8 +24,8 @@ require (
 	k8s.io/client-go v0.22.2
 	k8s.io/cloud-provider v0.20.0
 	k8s.io/component-base v0.20.0
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.50.2
 	k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e
 	k8s.io/legacy-cloud-providers v0.20.0
-	k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a
+	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
 )
diff --git a/go.sum b/go.sum
@@ -168,8 +168,9 @@ github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas=
 github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
-github.com/go-logr/logr v0.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc=
 github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU=
+github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE=
+github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-openapi/jsonpointer v0.19.2/go.mod h1:3akKfEdA7DF1sugOqz1dVQHBcuDBPKZGEoHC/NkiQRg=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
 github.com/go-openapi/jsonpointer v0.19.5 h1:gZr+CIYByUqjcgeLXnQu2gHYQC9o73G2XUeOFYEICuY=
@@ -990,21 +991,21 @@ k8s.io/controller-manager v0.20.0/go.mod h1:nD4qym/pmCz2v1tpqvlEBVlHW9CAZwedloM8
 k8s.io/csi-translation-lib v0.20.0/go.mod h1:M4CdD66GxEI6ev8aTtsA2NkK9kIF9K5VZQMcw/SsoLs=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
 k8s.io/gengo v0.0.0-20201113003025-83324d819ded/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
 k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=
-k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM=
 k8s.io/klog/v2 v2.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec=
+k8s.io/klog/v2 v2.50.2 h1:OsuacU5nfUhtQY1ictYdOEzkUoP5zkZ61i8F67Ch6W0=
+k8s.io/klog/v2 v2.50.2/go.mod h1:N3kgBtsFxMb4nQ0eBDgbHEt/dtxBuTkSFQ+7K5OUoz4=
 k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e h1:KLHHjkdQFomZy8+06csTWZ0m1343QqxZhR2LJ1OxCYM=
 k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e/go.mod h1:vHXdDvt9+2spS2Rx9ql3I8tycm3H9FDfdUoIuKCefvw=
 k8s.io/legacy-cloud-providers v0.20.0 h1:bF2WKO3ZWEjBvCv9RJxsxOAGrmQHWSgTiDBjK8uW2iw=
 k8s.io/legacy-cloud-providers v0.20.0/go.mod h1:1jEkaU7h9+b1EYdfWDBvhFAr+QpRfUjQfK+dGhxPGfA=
 k8s.io/utils v0.0.0-20201110183641-67b214c5f920/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
-k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a h1:8dYfu/Fc9Gz2rNJKB9IQRGgQOh2clmRzNIPPY1xLY5g=
 k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 h1:HNSDgDCrr/6Ly3WEGKZftiE7IY19Vz2GdbOCyI4qqhc=
+k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA=
 rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
 rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=

diff --git a/pkg/backends/backends.go b/pkg/backends/backends.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/ingress-gce/pkg/utils/namer"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/backends/features/affinity.go b/pkg/backends/features/affinity.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureAffinity reads the sessionAffinity and AffinityCookieTtlSec configuration

diff --git a/pkg/backends/features/cdn.go b/pkg/backends/features/cdn.go
@@ -24,7 +24,7 @@ import (
 	"github.com/kr/pretty"
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // This values are copied from GCP Load balancer

diff --git a/pkg/backends/features/cdn_test.go b/pkg/backends/features/cdn_test.go
@@ -27,7 +27,7 @@ import (
 	v1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 var (

diff --git a/pkg/backends/features/customrequestheaders.go b/pkg/backends/features/customrequestheaders.go
@@ -20,7 +20,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureCustomRequestHeaders reads the CustomRequestHeaders configuration specified in the ServicePort.BackendConfig

diff --git a/pkg/backends/features/draining.go b/pkg/backends/features/draining.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureDraining reads the ConnectionDraining configuration specified in

diff --git a/pkg/backends/features/iap.go b/pkg/backends/features/iap.go
@@ -22,7 +22,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureIAP reads the IAP configuration specified in the BackendConfig

diff --git a/pkg/backends/features/logging.go b/pkg/backends/features/logging.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureLogging reads the log configurations specified in the ServicePort.BackendConfig

diff --git a/pkg/backends/features/securitypolicy.go b/pkg/backends/features/securitypolicy.go
@@ -19,7 +19,7 @@ package features
 import (
 	"fmt"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"k8s.io/legacy-cloud-providers/gce"

diff --git a/pkg/backends/features/timeout.go b/pkg/backends/features/timeout.go
@@ -21,7 +21,7 @@ import (
 
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // EnsureTimeout reads the TimeoutSec configuration specified in the ServicePort.BackendConfig

diff --git a/pkg/backends/ig_linker.go b/pkg/backends/ig_linker.go
@@ -23,7 +23,7 @@ import (
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // BalancingMode represents the loadbalancing configuration of an individual

diff --git a/pkg/backends/neg_linker.go b/pkg/backends/neg_linker.go
@@ -15,6 +15,7 @@ package backends
 
 import (
 	"fmt"
+
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud"
 	"github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta"
 	"k8s.io/apimachinery/pkg/util/sets"
@@ -25,7 +26,7 @@ import (
 	"k8s.io/ingress-gce/pkg/flags"
 	"k8s.io/ingress-gce/pkg/neg/types"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/backends/regional_ig_linker.go b/pkg/backends/regional_ig_linker.go
@@ -21,7 +21,7 @@ import (
 	"k8s.io/ingress-gce/pkg/composite"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // RegionalInstanceGroupLinker handles linking backends to InstanceGroups.

diff --git a/pkg/backends/syncer.go b/pkg/backends/syncer.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-gce/pkg/healthchecks"
 	lbfeatures "k8s.io/ingress-gce/pkg/loadbalancers/features"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/cmconfig/controller.go b/pkg/cmconfig/controller.go
@@ -12,7 +12,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/ingress-gce/pkg/utils/patch"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // ConfigMapConfigController is the ConfigMap based config controller.

diff --git a/pkg/cmconfig/controller_test.go b/pkg/cmconfig/controller_test.go
@@ -15,7 +15,7 @@ import (
 	informerv1 "k8s.io/client-go/informers/core/v1"
 	"k8s.io/client-go/kubernetes/fake"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/pkg/common/operator/backendconfig.go b/pkg/common/operator/backendconfig.go
@@ -1,7 +1,7 @@
 package operator
 
 import (
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"k8s.io/ingress-gce/pkg/annotations"
 	backendconfigv1 "k8s.io/ingress-gce/pkg/apis/backendconfig/v1"

diff --git a/pkg/composite/composite.go b/pkg/composite/composite.go
@@ -26,7 +26,7 @@ import (
 	computebeta "google.golang.org/api/compute/v0.beta"
 	"google.golang.org/api/compute/v1"
 	"k8s.io/ingress-gce/pkg/composite/metrics"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/composite/gen.go b/pkg/composite/gen.go
@@ -29,7 +29,7 @@ import (
 	compute "google.golang.org/api/compute/v1"
 	"google.golang.org/api/googleapi"
 	compositemetrics "k8s.io/ingress-gce/pkg/composite/metrics"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/composite/gen/main.go b/pkg/composite/gen/main.go
@@ -78,7 +78,7 @@ package composite
 import (
 	"fmt"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	computealpha "google.golang.org/api/compute/v0.alpha"
 	computebeta "google.golang.org/api/compute/v0.beta"
 	compute "google.golang.org/api/compute/v1"

diff --git a/pkg/context/context.go b/pkg/context/context.go
@@ -58,7 +58,7 @@ import (
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/ingress-gce/pkg/utils/endpointslices"
 	"k8s.io/ingress-gce/pkg/utils/namer"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/legacy-cloud-providers/gce"
 )
 

diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go
@@ -53,7 +53,7 @@ import (
 	"k8s.io/ingress-gce/pkg/utils"
 	"k8s.io/ingress-gce/pkg/utils/common"
 	"k8s.io/ingress-gce/pkg/utils/namer"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // LoadBalancerController watches the kubernetes api and adds/removes services

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -25,7 +25,7 @@ import (
 	"k8s.io/ingress-gce/pkg/context"
 	"k8s.io/ingress-gce/pkg/instances"
 	"k8s.io/ingress-gce/pkg/utils"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // NodeController synchronizes the state of the nodes to the unmanaged instance
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ import ( @@
     	"time"
     	"k8s.io/ingress-gce/pkg/version"
-    	"k8s.io/klog"
+    	"k8s.io/klog/v2"
     )
     const (
@@ Expand Down @@