From 20bb3ff8ca03504e1fb0f341fb8334180fe9eb78 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Mon, 14 Apr 2025 14:23:41 -0400 Subject: [PATCH] Fix log initialization Use proper flags and remove use of logrus and klog Signed-off-by: Todd Short --- .github/workflows/e2e.yaml | 2 +- .github/workflows/unit-test.yaml | 2 +- cmd/catalogd/main.go | 8 +------- cmd/operator-controller/main.go | 11 ++--------- go.mod | 2 +- 5 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index cca4559cc..3ae42b0e9 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -41,7 +41,7 @@ jobs: name: e2e-artifacts path: /tmp/artifacts/ - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v5.4.0 with: disable_search: true files: coverage/e2e.out diff --git a/.github/workflows/unit-test.yaml b/.github/workflows/unit-test.yaml index adb837747..20388bca8 100644 --- a/.github/workflows/unit-test.yaml +++ b/.github/workflows/unit-test.yaml @@ -23,7 +23,7 @@ jobs: run: | make test-unit - - uses: codecov/codecov-action@v5 + - uses: codecov/codecov-action@v5.4.0 with: disable_search: true files: coverage/unit.out diff --git a/cmd/catalogd/main.go b/cmd/catalogd/main.go index aff3efeb3..8bf083285 100644 --- a/cmd/catalogd/main.go +++ b/cmd/catalogd/main.go @@ -29,7 +29,6 @@ import ( "time" "github.com/containers/image/v5/types" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/fields" @@ -42,7 +41,6 @@ import ( "k8s.io/client-go/metadata" _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/klog/v2" - "k8s.io/klog/v2/textlogger" "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" crcache "sigs.k8s.io/controller-runtime/pkg/cache" @@ -146,7 +144,7 @@ func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) utilruntime.Must(ocv1.AddToScheme(scheme)) - ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig())) + ctrl.SetLogger(klog.NewKlogr()) } func main() { @@ -190,10 +188,6 @@ func validateConfig(cfg *config) error { } func run(ctx context.Context) error { - if klog.V(4).Enabled() { - logrus.SetLevel(logrus.DebugLevel) - } - authFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("%s-%s.json", authFilePrefix, apimachineryrand.String(8))) protocol := "http://" diff --git a/cmd/operator-controller/main.go b/cmd/operator-controller/main.go index 80ab0e4e6..57131226f 100644 --- a/cmd/operator-controller/main.go +++ b/cmd/operator-controller/main.go @@ -29,7 +29,6 @@ import ( "time" "github.com/containers/image/v5/types" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" corev1 "k8s.io/api/core/v1" apiextensionsv1client "k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1" @@ -40,7 +39,6 @@ import ( corev1client "k8s.io/client-go/kubernetes/typed/core/v1" _ "k8s.io/client-go/plugin/pkg/client/auth" "k8s.io/klog/v2" - "k8s.io/klog/v2/textlogger" "k8s.io/utils/ptr" ctrl "sigs.k8s.io/controller-runtime" crcache "sigs.k8s.io/controller-runtime/pkg/cache" @@ -148,15 +146,14 @@ func init() { //adds version sub command operatorControllerCmd.AddCommand(versionCommand) - klog.InitFlags(flag.CommandLine) - //add klog flags to flagset + klog.InitFlags(flag.CommandLine) flags.AddGoFlagSet(flag.CommandLine) //add feature gate flags to flagset features.OperatorControllerFeatureGate.AddFlag(flags) - ctrl.SetLogger(textlogger.NewLogger(textlogger.NewConfig())) + ctrl.SetLogger(klog.NewKlogr()) } func validateMetricsFlags() error { if (cfg.certFile != "" && cfg.keyFile == "") || (cfg.certFile == "" && cfg.keyFile != "") { @@ -179,10 +176,6 @@ func validateMetricsFlags() error { return nil } func run() error { - if klog.V(4).Enabled() { - logrus.SetLevel(logrus.DebugLevel) - } - setupLog.Info("starting up the controller", "version info", version.String()) authFilePath := filepath.Join(os.TempDir(), fmt.Sprintf("%s-%s.json", authFilePrefix, apimachineryrand.String(8))) diff --git a/go.mod b/go.mod index 246e5a447..749294fb4 100644 --- a/go.mod +++ b/go.mod @@ -21,7 +21,6 @@ require ( github.com/operator-framework/helm-operator-plugins v0.8.0 github.com/operator-framework/operator-registry v1.51.0 github.com/prometheus/client_golang v1.22.0 - github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.9.1 github.com/stretchr/testify v1.10.0 golang.org/x/exp v0.0.0-20250228200357-dead58393ab7 @@ -187,6 +186,7 @@ require ( github.com/sigstore/fulcio v1.6.4 // indirect github.com/sigstore/rekor v1.3.8 // indirect github.com/sigstore/sigstore v1.8.12 // indirect + github.com/sirupsen/logrus v1.9.3 // indirect github.com/smallstep/pkcs7 v0.1.1 // indirect github.com/spf13/cast v1.7.0 // indirect github.com/spf13/pflag v1.0.6 // indirect