Skip to content

Commit 07b7a42

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #823 from hakman/avast-retry
Update github.com/avast/retry-go to v4.5.0
2 parents 698c8b0 + a5aadf7 commit 07b7a42

File tree

20 files changed

+612
-344
lines changed

20 files changed

+612
-344
lines changed

Diff for: ‎go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ require (
77
contrib.go.opencensus.io/exporter/prometheus v0.4.2
88
contrib.go.opencensus.io/exporter/stackdriver v0.13.14
99
github.com/acobaugh/osrelease v0.1.0
10-
github.com/avast/retry-go v3.0.0+incompatible
10+
github.com/avast/retry-go/v4 v4.5.0
1111
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

Diff for: ‎go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,8 @@ github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgI
140140
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
141141
github.com/asaskevich/govalidator v0.0.0-20200907205600-7a23bdc65eef/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
142142
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d/go.mod h1:WaHUgvxTVq04UNunO+XhnAqY/wQc+bxr74GqbsZ/Jqw=
143-
github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
144-
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
143+
github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
144+
github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
145145
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
146146
github.com/aws/aws-sdk-go v1.38.35/go.mod h1:hcU610XS61/+aQV88ixoOzUoG7v3b31pl2zKMmprdro=
147147
github.com/aws/aws-sdk-go v1.43.11/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo=

Diff for: ‎pkg/exporters/stackdriver/stackdriver_exporter.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ import (
3030
"google.golang.org/api/option"
3131
"k8s.io/klog/v2"
3232

33-
"github.com/avast/retry-go"
33+
"github.com/avast/retry-go/v4"
3434
"k8s.io/node-problem-detector/pkg/exporters"
3535
seconfig "k8s.io/node-problem-detector/pkg/exporters/stackdriver/config"
3636
"k8s.io/node-problem-detector/pkg/types"

Diff for: ‎test/e2e/lib/npd/npd.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
"k8s.io/node-problem-detector/pkg/util/metrics"
2727
"k8s.io/node-problem-detector/test/e2e/lib/gce"
2828

29-
"github.com/avast/retry-go"
29+
"github.com/avast/retry-go/v4"
3030
)
3131

3232
// SetupNPD installs NPD from the test tarball onto the provided GCE instance.

Diff for: ‎test/go.mod

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ go 1.20
55
replace k8s.io/node-problem-detector => ../.
66

77
require (
8-
github.com/avast/retry-go v3.0.0+incompatible
8+
github.com/avast/retry-go/v4 v4.5.0
99
github.com/onsi/ginkgo v1.16.5
1010
github.com/onsi/gomega v1.27.10
1111
github.com/pborman/uuid v1.2.1

Diff for: ‎test/go.sum

+2-2
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkY
106106
github.com/asaskevich/govalidator v0.0.0-20180720115003-f9ffefc3facf/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
107107
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY=
108108
github.com/asaskevich/govalidator v0.0.0-20200108200545-475eaeb16496/go.mod h1:oGkLhpf+kjZl6xBf758TQhh5XrAeiJv/7FRz/2spLIg=
109-
github.com/avast/retry-go v3.0.0+incompatible h1:4SOWQ7Qs+oroOTQOYnAHqelpCO0biHSxpiH9JdtuBj0=
110-
github.com/avast/retry-go v3.0.0+incompatible/go.mod h1:XtSnn+n/sHqQIpZ10K1qAevBhOOCWBLXXy3hyiqqBrY=
109+
github.com/avast/retry-go/v4 v4.5.0 h1:QoRAZZ90cj5oni2Lsgl2GW8mNTnUCnmpx/iKpwVisHg=
110+
github.com/avast/retry-go/v4 v4.5.0/go.mod h1:7hLEXp0oku2Nir2xBAsg0PTphp9z71bN5Aq1fboC3+I=
111111
github.com/aws/aws-k8s-tester v1.0.0/go.mod h1:NUNd9k43+h9O5tvwL+4N1Ctb//SapmeeFX1G0/2/0Qc=
112112
github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=
113113
github.com/aws/aws-sdk-go v1.15.27/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0=

Diff for: ‎vendor/github.com/avast/retry-go/.travis.yml

-20
This file was deleted.

Diff for: ‎vendor/github.com/avast/retry-go/Gopkg.toml

-3
This file was deleted.

Diff for: ‎vendor/github.com/avast/retry-go/VERSION

-1
This file was deleted.

Diff for: ‎vendor/github.com/avast/retry-go/appveyor.yml

-19
This file was deleted.

Diff for: ‎vendor/github.com/avast/retry-go/retry.go

-225
This file was deleted.

Diff for: ‎vendor/github.com/avast/retry-go/.gitignore renamed to ‎vendor/github.com/avast/retry-go/v4/.gitignore

File renamed without changes.

Diff for: ‎vendor/github.com/avast/retry-go/.godocdown.tmpl renamed to ‎vendor/github.com/avast/retry-go/v4/.godocdown.tmpl

+3-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎vendor/github.com/avast/retry-go/LICENSE renamed to ‎vendor/github.com/avast/retry-go/v4/LICENSE

File renamed without changes.

0 commit comments

Comments
 (0)