diff --git a/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go b/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go index e450584fbba..55c71645e00 100644 --- a/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go +++ b/pkg/plugins/golang/v3/scaffolds/internal/templates/main.go @@ -188,6 +188,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -196,7 +198,6 @@ import ( utilruntime "k8s.io/apimachinery/pkg/util/runtime" clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" - "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/healthz" %s ) @@ -229,13 +230,9 @@ func main() { "Omit this flag to use the default configuration values. " + "Command-line flags override configuration from this file.") {{- end }} - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) {{ if not .ComponentConfig }} mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ diff --git a/testdata/project-v3-addon-and-grafana/go.mod b/testdata/project-v3-addon-and-grafana/go.mod index 8a1807b746a..ebdfd03721b 100644 --- a/testdata/project-v3-addon-and-grafana/go.mod +++ b/testdata/project-v3-addon-and-grafana/go.mod @@ -8,6 +8,7 @@ require ( github.com/onsi/gomega v1.19.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 sigs.k8s.io/kubebuilder-declarative-pattern v0.11.20220513-0.20220907223038-e0605f0e1a40 ) @@ -108,7 +109,6 @@ require ( k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/cli-runtime v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/kubectl v0.25.0 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect diff --git a/testdata/project-v3-addon-and-grafana/main.go b/testdata/project-v3-addon-and-grafana/main.go index 8ca605947a5..336a4965b7c 100644 --- a/testdata/project-v3-addon-and-grafana/main.go +++ b/testdata/project-v3-addon-and-grafana/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v3-addon-and-grafana/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v3-config/go.mod b/testdata/project-v3-config/go.mod index fed6554d422..de013b9cf53 100644 --- a/testdata/project-v3-config/go.mod +++ b/testdata/project-v3-config/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v3-config/main.go b/testdata/project-v3-config/main.go index d3fd27640fe..547c9a4e739 100644 --- a/testdata/project-v3-config/main.go +++ b/testdata/project-v3-config/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v3-config/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v3-config/controllers" @@ -54,13 +55,9 @@ func main() { "The controller will load its initial configuration from this file. "+ "Omit this flag to use the default configuration values. "+ "Command-line flags override configuration from this file.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) var err error options := ctrl.Options{Scheme: scheme} diff --git a/testdata/project-v3-multigroup/go.mod b/testdata/project-v3-multigroup/go.mod index b692aea5075..0fe9fdf95fd 100644 --- a/testdata/project-v3-multigroup/go.mod +++ b/testdata/project-v3-multigroup/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v3-multigroup/main.go b/testdata/project-v3-multigroup/main.go index 55e34cb64f2..cea15cd6c41 100644 --- a/testdata/project-v3-multigroup/main.go +++ b/testdata/project-v3-multigroup/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v3-multigroup/apis/crew/v1" fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v3-multigroup/apis/fiz/v1" @@ -82,13 +83,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v3-with-deploy-image/go.mod b/testdata/project-v3-with-deploy-image/go.mod index eb98801d48a..23bfa0d2461 100644 --- a/testdata/project-v3-with-deploy-image/go.mod +++ b/testdata/project-v3-with-deploy-image/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v3-with-deploy-image/main.go b/testdata/project-v3-with-deploy-image/main.go index 8d297f952d1..41d0329fff5 100644 --- a/testdata/project-v3-with-deploy-image/main.go +++ b/testdata/project-v3-with-deploy-image/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v3-with-deploy-image/api/v1alpha1" "sigs.k8s.io/kubebuilder/testdata/project-v3-with-deploy-image/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v3/go.mod b/testdata/project-v3/go.mod index 0532a61dd30..3e809944dd8 100644 --- a/testdata/project-v3/go.mod +++ b/testdata/project-v3/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v3/main.go b/testdata/project-v3/main.go index 81da09f3887..8f02e2f6662 100644 --- a/testdata/project-v3/main.go +++ b/testdata/project-v3/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v3/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v3/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v4-addon-and-grafana/go.mod b/testdata/project-v4-addon-and-grafana/go.mod index 9990f378398..d83546a66dc 100644 --- a/testdata/project-v4-addon-and-grafana/go.mod +++ b/testdata/project-v4-addon-and-grafana/go.mod @@ -8,6 +8,7 @@ require ( github.com/onsi/gomega v1.19.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 sigs.k8s.io/kubebuilder-declarative-pattern v0.11.20220513-0.20220907223038-e0605f0e1a40 ) @@ -108,7 +109,6 @@ require ( k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/cli-runtime v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/kubectl v0.25.0 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect diff --git a/testdata/project-v4-addon-and-grafana/main.go b/testdata/project-v4-addon-and-grafana/main.go index 6428f01e493..84aa692874e 100644 --- a/testdata/project-v4-addon-and-grafana/main.go +++ b/testdata/project-v4-addon-and-grafana/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-addon-and-grafana/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v4-addon-and-grafana/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v4-config/go.mod b/testdata/project-v4-config/go.mod index e9ed0f1f0fb..317fa375c09 100644 --- a/testdata/project-v4-config/go.mod +++ b/testdata/project-v4-config/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v4-config/main.go b/testdata/project-v4-config/main.go index 296c9d8af21..3c342d07e84 100644 --- a/testdata/project-v4-config/main.go +++ b/testdata/project-v4-config/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-config/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v4-config/controllers" @@ -54,13 +55,9 @@ func main() { "The controller will load its initial configuration from this file. "+ "Omit this flag to use the default configuration values. "+ "Command-line flags override configuration from this file.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) var err error options := ctrl.Options{Scheme: scheme} diff --git a/testdata/project-v4-multigroup/go.mod b/testdata/project-v4-multigroup/go.mod index 3f000b4508b..592e0eccab9 100644 --- a/testdata/project-v4-multigroup/go.mod +++ b/testdata/project-v4-multigroup/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v4-multigroup/main.go b/testdata/project-v4-multigroup/main.go index fb53924ca8f..01bf2c6a1ea 100644 --- a/testdata/project-v4-multigroup/main.go +++ b/testdata/project-v4-multigroup/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/apis/crew/v1" fizv1 "sigs.k8s.io/kubebuilder/testdata/project-v4-multigroup/apis/fiz/v1" @@ -82,13 +83,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v4-with-deploy-image/go.mod b/testdata/project-v4-with-deploy-image/go.mod index aad7cfa4c15..af86c6bc989 100644 --- a/testdata/project-v4-with-deploy-image/go.mod +++ b/testdata/project-v4-with-deploy-image/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v4-with-deploy-image/main.go b/testdata/project-v4-with-deploy-image/main.go index 59d643f1727..21eb378f9a3 100644 --- a/testdata/project-v4-with-deploy-image/main.go +++ b/testdata/project-v4-with-deploy-image/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" examplecomv1alpha1 "sigs.k8s.io/kubebuilder/testdata/project-v4-with-deploy-image/api/v1alpha1" "sigs.k8s.io/kubebuilder/testdata/project-v4-with-deploy-image/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme, diff --git a/testdata/project-v4/go.mod b/testdata/project-v4/go.mod index ff017d249db..be3b3daa3f8 100644 --- a/testdata/project-v4/go.mod +++ b/testdata/project-v4/go.mod @@ -8,6 +8,7 @@ require ( k8s.io/api v0.25.0 k8s.io/apimachinery v0.25.0 k8s.io/client-go v0.25.0 + k8s.io/klog/v2 v2.70.1 sigs.k8s.io/controller-runtime v0.13.0 ) @@ -72,7 +73,6 @@ require ( gopkg.in/yaml.v3 v3.0.1 // indirect k8s.io/apiextensions-apiserver v0.25.0 // indirect k8s.io/component-base v0.25.0 // indirect - k8s.io/klog/v2 v2.70.1 // indirect k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect diff --git a/testdata/project-v4/main.go b/testdata/project-v4/main.go index 1c44a24f4dc..1b952f73a3b 100644 --- a/testdata/project-v4/main.go +++ b/testdata/project-v4/main.go @@ -20,6 +20,8 @@ import ( "flag" "os" + "k8s.io/klog/v2" + // Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.) // to ensure that exec-entrypoint and run can make use of them. _ "k8s.io/client-go/plugin/pkg/client/auth" @@ -29,7 +31,6 @@ import ( clientgoscheme "k8s.io/client-go/kubernetes/scheme" ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/healthz" - "sigs.k8s.io/controller-runtime/pkg/log/zap" crewv1 "sigs.k8s.io/kubebuilder/testdata/project-v4/api/v1" "sigs.k8s.io/kubebuilder/testdata/project-v4/controllers" @@ -57,13 +58,9 @@ func main() { flag.BoolVar(&enableLeaderElection, "leader-elect", false, "Enable leader election for controller manager. "+ "Enabling this will ensure there is only one active controller manager.") - opts := zap.Options{ - Development: true, - } - opts.BindFlags(flag.CommandLine) flag.Parse() - ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts))) + ctrl.SetLogger(klog.NewKlogr()) mgr, err := ctrl.NewManager(ctrl.GetConfigOrDie(), ctrl.Options{ Scheme: scheme,