Skip to content

Commit 8fbfd30

Browse files
committed
BUILD/MINOR: go.mod: upgrade client-native [v3.2]
Upgrade github.com/haproxytech/client-native/v6 to v6.2.14
1 parent ad9807d commit 8fbfd30

5 files changed

Lines changed: 11 additions & 9 deletions

File tree

client-native/events.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ func ListenHAProxyEvents(ctx context.Context, client clientnative.HAProxyClient)
6868
return nil, err
6969
}
7070
// v3.2+
71-
if version.Major < 3 || (version.Major == 3 && version.Minor < 2) {
71+
if version.Major() < 3 || (version.Major() == 3 && version.Minor() < 2) {
7272
return nil, ErrOldVersion
7373
}
7474

configure_data_plane.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ import (
3030
"sync"
3131
"syscall"
3232

33+
"github.com/Masterminds/semver/v3"
3334
"github.com/getkin/kin-openapi/openapi2"
3435
"github.com/getkin/kin-openapi/openapi2conv"
3536
"github.com/getkin/kin-openapi/openapi3"
@@ -1215,7 +1216,7 @@ func canUseMasterSocketReload(conf *dataplaneapi_config.HAProxyConfiguration, cl
12151216
return false
12161217
}
12171218

1218-
return cn_runtime.IsBiggerOrEqual(&cn_runtime.HAProxyVersion{Major: 2, Minor: 7}, &currVersion)
1219+
return cn_runtime.IsBiggerOrEqual(&cn_runtime.HAProxyVersion{Version: semver.New(2, 7, 0, "", "")}, &currVersion)
12191220
}
12201221

12211222
func configureNativeClient(cyx context.Context, haproxyOptions dataplaneapi_config.HAProxyConfiguration, mWorker bool) client_native.HAProxyClient {

embedded_spec.go

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

go.mod

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ go 1.26
55
require (
66
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5
77
github.com/KimMachineGun/automemlimit v0.7.4
8+
github.com/Masterminds/semver/v3 v3.5.0
89
github.com/aws/aws-sdk-go-v2 v1.41.7
910
github.com/aws/aws-sdk-go-v2/config v1.32.17
1011
github.com/aws/aws-sdk-go-v2/credentials v1.19.16
@@ -26,7 +27,7 @@ require (
2627
github.com/google/go-cmp v0.7.0
2728
github.com/google/renameio v1.0.1
2829
github.com/google/uuid v1.6.0
29-
github.com/haproxytech/client-native/v6 v6.2.13
30+
github.com/haproxytech/client-native/v6 v6.2.14
3031
github.com/jessevdk/go-flags v1.6.1
3132
github.com/joho/godotenv v1.5.1
3233
github.com/json-iterator/go v1.1.12

go.sum

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5 h1:IEjq88XO4PuBDcv
2424
github.com/GehirnInc/crypt v0.0.0-20230320061759-8cc1b52080c5/go.mod h1:exZ0C/1emQJAw5tHOaUDyY1ycttqBAPcxuzf7QbY6ec=
2525
github.com/KimMachineGun/automemlimit v0.7.4 h1:UY7QYOIfrr3wjjOAqahFmC3IaQCLWvur9nmfIn6LnWk=
2626
github.com/KimMachineGun/automemlimit v0.7.4/go.mod h1:QZxpHaGOQoYvFhv/r4u3U0JTC2ZcOwbSr11UZF46UBM=
27+
github.com/Masterminds/semver/v3 v3.5.0 h1:kQceYJfbupGfZOKZQg0kou0DgAKhzDg2NZPAwZ/2OOE=
28+
github.com/Masterminds/semver/v3 v3.5.0/go.mod h1:4V+yj/TJE1HU9XfppCwVMZq3I84lprf4nC11bSS5beM=
2729
github.com/aws/aws-sdk-go-v2 v1.41.7 h1:DWpAJt66FmnnaRIOT/8ASTucrvuDPZASqhhLey6tLY8=
2830
github.com/aws/aws-sdk-go-v2 v1.41.7/go.mod h1:4LAfZOPHNVNQEckOACQx60Y8pSRjIkNZQz1w92xpMJc=
2931
github.com/aws/aws-sdk-go-v2/config v1.32.17 h1:FpL4/758/diKwqbytU0prpuiu60fgXKUWCpDJtApclU=
@@ -177,8 +179,8 @@ github.com/googleapis/gax-go/v2 v2.14.1 h1:hb0FFeiPaQskmvakKu5EbCbpntQn48jyHuvrk
177179
github.com/googleapis/gax-go/v2 v2.14.1/go.mod h1:Hb/NubMaVM88SrNkvl8X/o8XWwDJEPqouaLeN2IUxoA=
178180
github.com/haproxytech/client-native/v5 v5.1.15 h1:oMqyDlh+vL3yRKiaapc6SESetCIir/Of3F75vtpG1Nk=
179181
github.com/haproxytech/client-native/v5 v5.1.15/go.mod h1:6eT7/KOsczPHFE/op1TDwfo0jQAsMffl7PuXkKJ+Mt0=
180-
github.com/haproxytech/client-native/v6 v6.2.13 h1:rRkznavsryqDhiHRSm9ASPgfKgQW4w6XSDXZo4AfFxQ=
181-
github.com/haproxytech/client-native/v6 v6.2.13/go.mod h1:+mmU0aIoQHkU+fhcNLcH8pDkz6hYbp4GqN5qfiL+D/g=
182+
github.com/haproxytech/client-native/v6 v6.2.14 h1:bmZpbn9C1JGG4T+BFlmPAAqiOBCGmzA2VA02tGVtln8=
183+
github.com/haproxytech/client-native/v6 v6.2.14/go.mod h1:JSUyyfkE2P5h6q9t/2ZvxsNO0LB27vCV0LVA+TuqXXI=
182184
github.com/haproxytech/go-logger v1.1.0 h1:HgGtYaI1ApkvbQdsm7f9AzQQoxTB7w37criTflh7IQE=
183185
github.com/haproxytech/go-logger v1.1.0/go.mod h1:OekUd8HCb7ubxMplzHUPBTHNxZmddOWfOjWclZsqIeM=
184186
github.com/hashicorp/go-cleanhttp v0.5.2 h1:035FKYIWjmULyFRBKPs8TBQoi0x6d9G4xc9neXJWAZQ=

0 commit comments

Comments
 (0)