Skip to content

Commit 3b0d0b0

Browse files
grokspawntmshort
grokspawn
authored and
tmshort
committed
bumping go-grpc-middleware with replace for k8s 1.32 (#1653)
Signed-off-by: grokspawn <[email protected]> Upstream-repository: operator-registry Upstream-commit: fd0f804b96a06bfc147283e01930737324b33510
1 parent e105a97 commit 3b0d0b0

File tree

7 files changed

+38
-15
lines changed

7 files changed

+38
-15
lines changed

‎go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ require (
122122
github.com/google/uuid v1.6.0 // indirect
123123
github.com/gorilla/mux v1.8.1 // indirect
124124
github.com/gorilla/websocket v1.5.0 // indirect
125-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 // indirect
125+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 // indirect
126126
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 // indirect
127127
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 // indirect
128128
github.com/h2non/filetype v1.1.3 // indirect

‎go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1795,8 +1795,8 @@ github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7/go.mod h1:Fecb
17951795
github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
17961796
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=
17971797
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0/go.mod h1:g5qyo/la0ALbONm6Vbp88Yd8NsDy6rZz+RcrMPxvld8=
1798-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 h1:kQ0NI7W1B3HwiN5gAYtY+XFItDPbLBwYRxAqbFTyDes=
1799-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0/go.mod h1:zrT2dxOAjNFPRGjTUe2Xmb4q4YdUwVvQFV6xiCSf+z0=
1798+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 h1:KcFzXwzM/kGhIRHvc8jdixfIJjVzuUJdnv+5xsPutog=
1799+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
18001800
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
18011801
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU=
18021802
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=

‎staging/operator-registry/go.mod

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
github.com/golang-migrate/migrate/v4 v4.18.2
1616
github.com/golang/mock v1.6.0
1717
github.com/google/go-cmp v0.7.0
18-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
18+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
1919
github.com/grpc-ecosystem/grpc-health-probe v0.4.37
2020
github.com/h2non/filetype v1.1.3
2121
github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c
@@ -56,6 +56,10 @@ require (
5656
sigs.k8s.io/yaml v1.4.0
5757
)
5858

59+
// https://github.com/kubernetes/apiserver/issues/116
60+
// reevaluate when we bump to k8s v1.33.0
61+
replace github.com/google/cel-go => github.com/google/cel-go v0.22.1
62+
5963
require (
6064
al.essio.dev/pkg/shellescape v1.5.1 // indirect
6165
cel.dev/expr v0.20.0 // indirect
@@ -117,7 +121,7 @@ require (
117121
github.com/gogo/protobuf v1.3.2 // indirect
118122
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
119123
github.com/golang/protobuf v1.5.4 // indirect
120-
github.com/google/cel-go v0.22.1 // indirect
124+
github.com/google/cel-go v0.23.0 // indirect
121125
github.com/google/gnostic-models v0.6.8 // indirect
122126
github.com/google/go-containerregistry v0.20.3 // indirect
123127
github.com/google/gofuzz v1.2.0 // indirect

‎staging/operator-registry/go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,8 @@ github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
232232
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
233233
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
234234
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
235-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0 h1:kQ0NI7W1B3HwiN5gAYtY+XFItDPbLBwYRxAqbFTyDes=
236-
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0/go.mod h1:zrT2dxOAjNFPRGjTUe2Xmb4q4YdUwVvQFV6xiCSf+z0=
235+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1 h1:KcFzXwzM/kGhIRHvc8jdixfIJjVzuUJdnv+5xsPutog=
236+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1/go.mod h1:qOchhhIlmRcqk/O9uCo/puJlyo07YINaIqdZfZG3Jkc=
237237
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99 h1:JYghRBlGCZyCF2wNUJ8W0cwaQdtpcssJ4CgC406g+WU=
238238
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99/go.mod h1:3bDW6wMZJB7tiONtC/1Xpicra6Wp5GgbTbQWCbI5fkc=
239239
github.com/grpc-ecosystem/grpc-gateway/v2 v2.25.1 h1:VNqngBF40hVlDloBruUehVYC3ArSgIyScOAyMRqBxRg=

‎vendor/github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging/interceptors.go

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

‎vendor/github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging/logging.go

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

‎vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -511,8 +511,8 @@ github.com/gorilla/mux
511511
# github.com/gorilla/websocket v1.5.0
512512
## explicit; go 1.12
513513
github.com/gorilla/websocket
514-
# github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.2.0
515-
## explicit; go 1.21
514+
# github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.1
515+
## explicit; go 1.23
516516
github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors
517517
github.com/grpc-ecosystem/go-grpc-middleware/v2/interceptors/logging
518518
# github.com/grpc-ecosystem/go-grpc-prometheus v1.2.1-0.20210315223345-82c243799c99

0 commit comments

Comments
 (0)