Skip to content

Commit 77ee88f

Browse files
rdimitrovrdimitrov
committed
Fix the version bump conflicts
Signed-off-by: Radoslav Dimitrov <[email protected]>
1 parent 615dc7d commit 77ee88f

File tree

3 files changed

+11
-18
lines changed

3 files changed

+11
-18
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ require (
66
github.com/1password/onepassword-sdk-go v0.3.0
77
github.com/cedar-policy/cedar-go v1.2.1
88
github.com/cenkalti/backoff/v5 v5.0.2
9-
github.com/cenkalti/backoff/v5 v5.0.2
109
github.com/containerd/errdefs v1.0.0
1110
github.com/docker/docker v28.2.2+incompatible
1211
github.com/docker/go-connections v0.5.0
@@ -49,6 +48,7 @@ require (
4948
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
5049
github.com/beorn7/perks v1.0.1 // indirect
5150
github.com/blang/semver v3.5.1+incompatible // indirect
51+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5252
github.com/cespare/xxhash/v2 v2.3.0 // indirect
5353
github.com/containerd/errdefs/pkg v0.3.0 // indirect
5454
github.com/containerd/stargz-snapshotter/estargz v0.16.3 // indirect

‎go.sum

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -429,8 +429,6 @@ github.com/lib/pq v1.1.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
429429
github.com/lib/pq v1.2.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
430430
github.com/lib/pq v1.10.2/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
431431
github.com/lib/pq v1.10.7/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
432-
github.com/lmittmann/tint v1.1.1 h1:xmmGuinUsCSxWdwH1OqMUQ4tzQsq3BdjJLAAmVKJ9Dw=
433-
github.com/lmittmann/tint v1.1.1/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
434432
github.com/lmittmann/tint v1.1.2 h1:2CQzrL6rslrsyjqLDwD11bZ5OpLBPU+g3G/r5LSfS8w=
435433
github.com/lmittmann/tint v1.1.2/go.mod h1:HIS3gSy7qNwGCj+5oRjAutErFBl4BzdQP6cJZ0NfMwE=
436434
github.com/luna-duclos/instrumentedsql v1.1.3/go.mod h1:9J1njvFds+zN7y85EDhN9XNQLANWwZt2ULeIC8yMNYs=
@@ -631,8 +629,6 @@ github.com/sv-tools/openapi v0.2.1 h1:ES1tMQMJFGibWndMagvdoo34T1Vllxr1Nlm5wz6b1a
631629
github.com/sv-tools/openapi v0.2.1/go.mod h1:k5VuZamTw1HuiS9p2Wl5YIDWzYnHG6/FgPOSFXLAhGg=
632630
github.com/swaggo/swag/v2 v2.0.0-rc4 h1:SZ8cK68gcV6cslwrJMIOqPkJELRwq4gmjvk77MrvHvY=
633631
github.com/swaggo/swag/v2 v2.0.0-rc4/go.mod h1:Ow7Y8gF16BTCDn8YxZbyKn8FkMLRUHekv1kROJZpbvE=
634-
github.com/tailscale/hujson v0.0.0-20250226034555-ec1d1c113d33 h1:idh63uw+gsG05HwjZsAENCG4KZfyvjK03bpjxa5qRRk=
635-
github.com/tailscale/hujson v0.0.0-20250226034555-ec1d1c113d33/go.mod h1:EbW0wDK/qEUYI0A5bqq0C2kF8JTQwWONmGDBbzsxxHo=
636632
github.com/tailscale/hujson v0.0.0-20250605163823-992244df8c5a h1:a6TNDN9CgG+cYjaeN8l2mc4kSz2iMiCDQxPEyltUV/I=
637633
github.com/tailscale/hujson v0.0.0-20250605163823-992244df8c5a/go.mod h1:EbW0wDK/qEUYI0A5bqq0C2kF8JTQwWONmGDBbzsxxHo=
638634
github.com/tetratelabs/wabin v0.0.0-20230304001439-f6f874872834 h1:ZF+QBjOI+tILZjBaFj3HgFonKXUcwgJ4djLb6i42S3Q=
@@ -756,8 +752,6 @@ golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 h1:2dVuKD2vS7b0QIHQbpyTISPd0
756752
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56/go.mod h1:M4RDyNAINzryxdtnbRXRL/OHtkFuWGRjvuhBJpk2IlY=
757753
golang.org/x/exp/event v0.0.0-20220217172124-1812c5b45e43 h1:Yn6OLQDombmcne/0Jf2GiY4qPS5ML2W4KYFyx2uYxGY=
758754
golang.org/x/exp/event v0.0.0-20220217172124-1812c5b45e43/go.mod h1:AVlZHjhWbW/3yOcmKMtJiObwBPJajBlUpQXRijFNrNc=
759-
golang.org/x/exp/jsonrpc2 v0.0.0-20250531010427-b6e5de432a8b h1:fykv2LQFPSXU3HdV+evEn4IOntG4oaqVi5T4nXCiv2Q=
760-
golang.org/x/exp/jsonrpc2 v0.0.0-20250531010427-b6e5de432a8b/go.mod h1:nPUl66QnKRf99UZqZolP9+aV0hDQ39vdswdEZj6OKZA=
761755
golang.org/x/exp/jsonrpc2 v0.0.0-20250606033433-dcc06ee1d476 h1:yPPyCx5ZIq0FtoWYV2KjHhVEL5I22IqgM8Ttb6f3UFs=
762756
golang.org/x/exp/jsonrpc2 v0.0.0-20250606033433-dcc06ee1d476/go.mod h1:nPUl66QnKRf99UZqZolP9+aV0hDQ39vdswdEZj6OKZA=
763757
golang.org/x/lint v0.0.0-20190930215403-16217165b5de/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
@@ -769,8 +763,6 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
769763
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
770764
golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
771765
golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs=
772-
golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
773-
golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
774766
golang.org/x/mod v0.25.0 h1:n7a+ZbQKQA/Ysbyb0/6IbB1H/X41mKgbhfv7AfG/44w=
775767
golang.org/x/mod v0.25.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
776768
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -799,8 +791,6 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
799791
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
800792
golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
801793
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
802-
golang.org/x/sync v0.14.0 h1:woo0S4Yywslg6hp4eUFjTVOyKt0RookbpAHG4c1HmhQ=
803-
golang.org/x/sync v0.14.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
804794
golang.org/x/sync v0.15.0 h1:KWH3jNZsfyT6xfAfKiz6MRNmd46ByHDYaZ7KSkCtdW8=
805795
golang.org/x/sync v0.15.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
806796
golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

‎pkg/container/kubernetes/client.go

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"strings"
1313
"time"
1414

15-
backoff "github.com/cenkalti/backoff/v4"
15+
"github.com/cenkalti/backoff/v5"
1616
appsv1 "k8s.io/api/apps/v1"
1717
corev1 "k8s.io/api/core/v1"
1818
"k8s.io/apimachinery/pkg/api/errors"
@@ -170,18 +170,21 @@ func (c *Client) AttachToWorkload(ctx context.Context, workloadID string) (io.Wr
170170
// wrap with retry so we can retry if the connection fails
171171
// Create exponential backoff with max 5 retries
172172
expBackoff := backoff.NewExponentialBackOff()
173-
backoffWithRetries := backoff.WithMaxRetries(expBackoff, 5)
174173

175-
err := backoff.RetryNotify(func() error {
176-
return exec.StreamWithContext(ctx, remotecommand.StreamOptions{
174+
_, err := backoff.Retry(ctx, func() (any, error) {
175+
return nil, exec.StreamWithContext(ctx, remotecommand.StreamOptions{
177176
Stdin: stdinReader,
178177
Stdout: stdoutWriter,
179178
Stderr: stdoutWriter,
180179
Tty: false,
181180
})
182-
}, backoffWithRetries, func(err error, duration time.Duration) {
183-
logger.Errorf("Error attaching to workload %s: %v. Retrying in %s...", workloadID, err, duration)
184-
})
181+
},
182+
backoff.WithBackOff(expBackoff),
183+
backoff.WithMaxTries(5),
184+
backoff.WithNotify(func(err error, duration time.Duration) {
185+
logger.Errorf("Error attaching to workload %s: %v. Retrying in %s...", workloadID, err, duration)
186+
}),
187+
)
185188
if err != nil {
186189
if statusErr, ok := err.(*errors.StatusError); ok {
187190
logger.Errorf("Kubernetes API error: Status=%s, Message=%s, Reason=%s, Code=%d",

0 commit comments

Comments
 (0)