Skip to content

Commit ea792b1

Browse files
authored
downgrade gRPC server to v1.71.2 (#6964)
1 parent 41f2c1e commit ea792b1

File tree

186 files changed

+3794
-16134
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+3794
-16134
lines changed

go.mod

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,6 @@ require (
150150
github.com/fsnotify/fsnotify v1.9.0 // indirect
151151
github.com/go-chi/chi/v5 v5.0.7 // indirect
152152
github.com/go-ini/ini v1.67.0 // indirect
153-
github.com/go-jose/go-jose/v4 v4.0.5 // indirect
154153
github.com/go-logfmt/logfmt v0.6.0 // indirect
155154
github.com/go-logr/logr v1.4.3 // indirect
156155
github.com/go-logr/stdr v1.2.2 // indirect
@@ -240,7 +239,6 @@ require (
240239
github.com/shurcooL/vfsgen v0.0.0-20230704071429-0000e147ea92 // indirect
241240
github.com/sirupsen/logrus v1.9.3 // indirect
242241
github.com/soheilhy/cmux v0.1.5 // indirect
243-
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
244242
github.com/stretchr/objx v0.5.2 // indirect
245243
github.com/tinylib/msgp v1.3.0 // indirect
246244
github.com/trivago/tgo v1.0.7 // indirect
@@ -249,7 +247,6 @@ require (
249247
github.com/weaveworks/promrus v1.2.0 // indirect
250248
github.com/xhit/go-str2duration/v2 v2.1.0 // indirect
251249
github.com/yuin/gopher-lua v1.1.1 // indirect
252-
github.com/zeebo/errs v1.4.0 // indirect
253250
go.mongodb.org/mongo-driver v1.17.4 // indirect
254251
go.opencensus.io v0.24.0 // indirect
255252
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
@@ -326,3 +323,9 @@ replace github.com/google/gnostic => github.com/googleapis/gnostic v0.6.9
326323
// Same replace used by thanos: (may be removed in the future)
327324
// https://github.com/thanos-io/thanos/blob/fdeea3917591fc363a329cbe23af37c6fff0b5f0/go.mod#L265
328325
replace gopkg.in/alecthomas/kingpin.v2 => github.com/alecthomas/kingpin v1.3.8-0.20210301060133-17f40c25f497
326+
327+
// Wait for fix for https://github.com/grpc/grpc-go/pull/8504.
328+
replace google.golang.org/grpc => google.golang.org/grpc v1.71.2
329+
330+
// See https://github.com/envoyproxy/go-control-plane/issues/1083 as this version introduces checksum mismatch.
331+
exclude github.com/envoyproxy/go-control-plane/envoy v1.32.3

go.sum

Lines changed: 1193 additions & 65 deletions
Large diffs are not rendered by default.

pkg/ring/client/pool_test.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,6 @@ type mockClient struct {
2121
status grpc_health_v1.HealthCheckResponse_ServingStatus
2222
}
2323

24-
func (i mockClient) List(ctx context.Context, in *grpc_health_v1.HealthListRequest, opts ...grpc.CallOption) (*grpc_health_v1.HealthListResponse, error) {
25-
if !i.happy {
26-
return nil, fmt.Errorf("Fail")
27-
}
28-
return &grpc_health_v1.HealthListResponse{}, nil
29-
}
30-
3124
func (i mockClient) Check(ctx context.Context, in *grpc_health_v1.HealthCheckRequest, opts ...grpc.CallOption) (*grpc_health_v1.HealthCheckResponse, error) {
3225
if !i.happy {
3326
return nil, fmt.Errorf("Fail")

pkg/util/grpcutil/health_check.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,6 @@ func (h *HealthCheck) Check(_ context.Context, _ *grpc_health_v1.HealthCheckRequ
3232
return &grpc_health_v1.HealthCheckResponse{Status: grpc_health_v1.HealthCheckResponse_SERVING}, nil
3333
}
3434

35-
func (h *HealthCheck) List(ctx context.Context, request *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
36-
checkResp, err := h.Check(ctx, nil)
37-
if err != nil {
38-
return &grpc_health_v1.HealthListResponse{}, err
39-
}
40-
41-
return &grpc_health_v1.HealthListResponse{
42-
Statuses: map[string]*grpc_health_v1.HealthCheckResponse{
43-
"server": checkResp,
44-
},
45-
}, nil
46-
}
47-
4835
// Watch implements the grpc healthcheck.
4936
func (h *HealthCheck) Watch(_ *grpc_health_v1.HealthCheckRequest, _ grpc_health_v1.Health_WatchServer) error {
5037
return status.Error(codes.Unimplemented, "Watching is not supported")

pkg/util/tls/test/tls_integration_test.go

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -39,19 +39,6 @@ type grpcHealthCheck struct {
3939
healthy bool
4040
}
4141

42-
func (h *grpcHealthCheck) List(ctx context.Context, request *grpc_health_v1.HealthListRequest) (*grpc_health_v1.HealthListResponse, error) {
43-
checkResp, err := h.Check(ctx, nil)
44-
if err != nil {
45-
return &grpc_health_v1.HealthListResponse{}, err
46-
}
47-
48-
return &grpc_health_v1.HealthListResponse{
49-
Statuses: map[string]*grpc_health_v1.HealthCheckResponse{
50-
"server": checkResp,
51-
},
52-
}, nil
53-
}
54-
5542
func (h *grpcHealthCheck) Check(_ context.Context, _ *grpc_health_v1.HealthCheckRequest) (*grpc_health_v1.HealthCheckResponse, error) {
5643
if !h.healthy {
5744
return &grpc_health_v1.HealthCheckResponse{Status: grpc_health_v1.HealthCheckResponse_NOT_SERVING}, nil

vendor/github.com/go-jose/go-jose/v4/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

vendor/github.com/go-jose/go-jose/v4/.golangci.yml

Lines changed: 0 additions & 53 deletions
This file was deleted.

vendor/github.com/go-jose/go-jose/v4/.travis.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

vendor/github.com/go-jose/go-jose/v4/CHANGELOG.md

Lines changed: 0 additions & 96 deletions
This file was deleted.

vendor/github.com/go-jose/go-jose/v4/CONTRIBUTING.md

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)