From bba61a964073f55b0da591e7f2895a9a4c52eb95 Mon Sep 17 00:00:00 2001 From: Mikel Olasagasti Uranga Date: Wed, 3 Jan 2024 18:15:27 +0100 Subject: [PATCH] Drop dep on github.com/coreos/pkg (#629) Signed-off-by: Mikel Olasagasti Uranga --- go.mod | 2 -- go.sum | 4 ---- internal/logging/logging.go | 5 ----- 3 files changed, 11 deletions(-) diff --git a/go.mod b/go.mod index 719264d78a..27bad5cb88 100644 --- a/go.mod +++ b/go.mod @@ -25,7 +25,6 @@ require ( github.com/bmatcuk/doublestar v1.1.5 github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e github.com/cli/browser v1.3.0 - github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f github.com/davecgh/go-spew v1.1.1 github.com/dylanmei/winrmtest v0.0.0-20210303004826-fbc9ae56efb6 github.com/go-test/deep v1.0.3 @@ -162,7 +161,6 @@ require ( github.com/cli/safeexec v1.0.0 // indirect github.com/cli/shurcooL-graphql v0.0.2 // indirect github.com/cloudflare/circl v1.3.3 // indirect - github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d // indirect github.com/creack/pty v1.1.18 // indirect github.com/dimchansky/utfbom v1.1.1 // indirect github.com/dylanmei/iso8601 v0.1.0 // indirect diff --git a/go.sum b/go.sum index 7d567862be..e1e83f89e0 100644 --- a/go.sum +++ b/go.sum @@ -403,11 +403,7 @@ github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWH github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d h1:t5Wuyh53qYyg9eqn4BbnlIT+vmhyww0TatL+zT3uWgI= -github.com/coreos/go-systemd v0.0.0-20181012123002-c6f51f82210d/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f h1:lBNOc5arjvs8E5mO2tbpBpLoyyu8B6e44T7hJy6potg= -github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/creack/pty v1.1.17/go.mod h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4= diff --git a/internal/logging/logging.go b/internal/logging/logging.go index 85a92a1f88..3d2e4bb4ef 100644 --- a/internal/logging/logging.go +++ b/internal/logging/logging.go @@ -11,11 +11,6 @@ import ( "strings" "syscall" - // go.etcd.io/etcd imports capnslog, which calls log.SetOutput in its - // init() function, so importing it here means that our log.SetOutput - // wins. this is fixed in coreos v3.5, which is not released yet. See - // https://github.com/etcd-io/etcd/issues/12498 for more information. - _ "github.com/coreos/pkg/capnslog" "github.com/hashicorp/go-hclog" )