Skip to content

Commit 95829b8

Browse files
authored
Merge pull request #818 from hakman/updated-coreos-systemd
Update github.com/coreos/go-systemd to v22.5.0
2 parents ed94dff + fdd522a commit 95829b8

File tree

12 files changed

+117
-11
lines changed

12 files changed

+117
-11
lines changed

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ require (
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/acobaugh/osrelease v0.1.0
1010
github.com/avast/retry-go v3.0.0+incompatible
11-
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
11+
github.com/coreos/go-systemd/v22 v22.5.0
1212
github.com/euank/go-kmsg-parser v2.0.0+incompatible
1313
github.com/hpcloud/tail v1.0.0
1414
github.com/prometheus/client_model v0.4.0

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,11 +315,11 @@ github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee
315315
github.com/coreos/go-systemd v0.0.0-20161114122254-48702e0da86b/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
316316
github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
317317
github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
318-
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf h1:iW4rZ826su+pqaw19uhpSCzhj44qo35pNgKFGqzDKkU=
319-
github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
320318
github.com/coreos/go-systemd/v22 v22.0.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
321319
github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk=
322320
github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
321+
github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs=
322+
github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
323323
github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
324324
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
325325
github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=

pkg/systemlogmonitor/logwatchers/journald/log_watcher.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"strings"
2626
"time"
2727

28-
"github.com/coreos/go-systemd/sdjournal"
28+
"github.com/coreos/go-systemd/v22/sdjournal"
2929
"k8s.io/klog/v2"
3030

3131
"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"

pkg/systemlogmonitor/logwatchers/journald/log_watcher_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"testing"
2525
"time"
2626

27-
"github.com/coreos/go-systemd/sdjournal"
27+
"github.com/coreos/go-systemd/v22/sdjournal"
2828
"github.com/stretchr/testify/assert"
2929

3030
"k8s.io/node-problem-detector/pkg/systemlogmonitor/logwatchers/types"

vendor/github.com/coreos/go-systemd/v22/internal/dlopen/dlopen_example.go

Lines changed: 57 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/sdjournal/functions.go renamed to vendor/github.com/coreos/go-systemd/v22/sdjournal/functions.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/github.com/coreos/go-systemd/sdjournal/journal.go renamed to vendor/github.com/coreos/go-systemd/v22/sdjournal/journal.go

Lines changed: 50 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

vendor/modules.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,10 @@ github.com/census-instrumentation/opencensus-proto/gen-go/resource/v1
8282
# github.com/cespare/xxhash/v2 v2.2.0
8383
## explicit; go 1.11
8484
github.com/cespare/xxhash/v2
85-
# github.com/coreos/go-systemd v0.0.0-20191104093116-d3cd4ed1dbcf
86-
## explicit
87-
github.com/coreos/go-systemd/internal/dlopen
88-
github.com/coreos/go-systemd/sdjournal
85+
# github.com/coreos/go-systemd/v22 v22.5.0
86+
## explicit; go 1.12
87+
github.com/coreos/go-systemd/v22/internal/dlopen
88+
github.com/coreos/go-systemd/v22/sdjournal
8989
# github.com/davecgh/go-spew v1.1.1
9090
## explicit
9191
github.com/davecgh/go-spew/spew

0 commit comments

Comments
 (0)