Skip to content

Commit 9fb57e1

Browse files
hc-github-team-consul-coretempbharath-k1999
authored
Backport of update submodule version into release/1.8.x (#5077)
* no-op commit due to failed cherry-picking * update submodule version (#5075) * update submodule version * update sub modules to latest version * update go mod --------- Co-authored-by: temp <[email protected]> Co-authored-by: Bharath <[email protected]>
1 parent 9feed7f commit 9fb57e1

File tree

6 files changed

+554
-161
lines changed

6 files changed

+554
-161
lines changed

acceptance/go.mod

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,24 +2,21 @@ module github.com/hashicorp/consul-k8s/acceptance
22

33
go 1.25.5
44

5-
// replace these so we always use the latest version of the control-plane types
6-
replace github.com/hashicorp/consul-k8s/version => ../version
7-
85
require (
96
github.com/go-logr/logr v1.3.0
107
github.com/google/uuid v1.3.0
118
github.com/gruntwork-io/terratest v0.46.7
129
github.com/hashicorp/consul-k8s/control-plane v0.0.0-20240821160356-557f7c37e108
13-
github.com/hashicorp/consul/api v1.32.1
14-
github.com/hashicorp/consul/sdk v0.16.2
10+
github.com/hashicorp/consul/api v1.33.2
11+
github.com/hashicorp/consul/sdk v0.17.1
1512
github.com/hashicorp/go-multierror v1.1.1
1613
github.com/hashicorp/go-uuid v1.0.3
1714
github.com/hashicorp/go-version v1.6.0
1815
github.com/hashicorp/hcp-sdk-go v0.50.0
1916
github.com/hashicorp/serf v0.10.1
2017
github.com/hashicorp/vault/api v1.12.2
2118
github.com/stretchr/testify v1.8.4
22-
go.opentelemetry.io/proto/otlp v1.0.0
19+
go.opentelemetry.io/proto/otlp v0.19.0
2320
google.golang.org/protobuf v1.33.0
2421
gopkg.in/yaml.v2 v2.4.0
2522
k8s.io/api v0.28.9
@@ -65,14 +62,15 @@ require (
6562
github.com/go-openapi/validate v0.22.1 // indirect
6663
github.com/go-ozzo/ozzo-validation v3.6.0+incompatible // indirect
6764
github.com/go-sql-driver/mysql v1.5.0 // indirect
65+
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
6866
github.com/gogo/protobuf v1.3.2 // indirect
6967
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7068
github.com/golang/protobuf v1.5.4 // indirect
7169
github.com/google/gnostic-models v0.6.8 // indirect
7270
github.com/google/go-cmp v0.6.0 // indirect
7371
github.com/google/gofuzz v1.2.0 // indirect
7472
github.com/google/pprof v0.0.0-20230602150820-91b7bce49751 // indirect
75-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
73+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
7674
github.com/gruntwork-io/go-commons v0.8.0 // indirect
7775
github.com/hashicorp/consul-k8s/version v0.0.0 // indirect
7876
github.com/hashicorp/consul/proto-public v0.6.4 // indirect
@@ -123,12 +121,10 @@ require (
123121
github.com/spf13/pflag v1.0.5 // indirect
124122
github.com/urfave/cli v1.22.12 // indirect
125123
go.mongodb.org/mongo-driver v1.11.0 // indirect
126-
go.opentelemetry.io/otel v1.19.0 // indirect
127-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
128-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
129-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
124+
go.opentelemetry.io/otel v1.11.1 // indirect
125+
go.opentelemetry.io/otel/trace v1.11.1 // indirect
130126
golang.org/x/crypto v0.45.0 // indirect
131-
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394 // indirect
127+
golang.org/x/exp v0.0.0-20250808145144-a408d31f581a // indirect
132128
golang.org/x/mod v0.29.0 // indirect
133129
golang.org/x/net v0.47.0 // indirect
134130
golang.org/x/oauth2 v0.28.0 // indirect
@@ -139,6 +135,7 @@ require (
139135
golang.org/x/time v0.3.0 // indirect
140136
golang.org/x/tools v0.38.0 // indirect
141137
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
138+
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
142139
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
143140
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
144141
google.golang.org/grpc v1.58.3 // indirect

0 commit comments

Comments
 (0)