rebase: bump google.golang.org/grpc from 1.72.1 to 1.72.2

Bumps [google.golang.org/grpc](https://github.com/grpc/grpc-go) from 1.72.1 to 1.72.2.
- [Release notes](https://github.com/grpc/grpc-go/releases)
- [Commits](https://github.com/grpc/grpc-go/compare/v1.72.1...v1.72.2)

---
updated-dependencies:
- dependency-name: google.golang.org/grpc
  dependency-version: 1.72.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
This commit is contained in:
dependabot[bot] 2025-05-26 20:24:38 +00:00 committed by mergify[bot]
parent 8b67e29bca
commit 4e1c8216ad
5 changed files with 37 additions and 22 deletions

2
go.mod
View File

@ -33,7 +33,7 @@ require (
golang.org/x/crypto v0.38.0 golang.org/x/crypto v0.38.0
golang.org/x/net v0.40.0 golang.org/x/net v0.40.0
golang.org/x/sys v0.33.0 golang.org/x/sys v0.33.0
google.golang.org/grpc v1.72.1 google.golang.org/grpc v1.72.2
google.golang.org/protobuf v1.36.6 google.golang.org/protobuf v1.36.6
k8s.io/api v0.33.1 k8s.io/api v0.33.1
k8s.io/apimachinery v0.33.1 k8s.io/apimachinery v0.33.1

4
go.sum
View File

@ -1291,8 +1291,8 @@ google.golang.org/grpc v1.45.0/go.mod h1:lN7owxKUQEqMfSyQikvvk5tf/6zMPsrK+ONuO11
google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.46.2/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk= google.golang.org/grpc v1.47.0/go.mod h1:vN9eftEi1UMyUsIF80+uQXhHjbXYbm0uXoFCACuMGWk=
google.golang.org/grpc v1.72.1 h1:HR03wO6eyZ7lknl75XlxABNVLLFc2PAb6mHlYh756mA= google.golang.org/grpc v1.72.2 h1:TdbGzwb82ty4OusHWepvFWGLgIbNo1/SUynEN0ssqv8=
google.golang.org/grpc v1.72.1/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM= google.golang.org/grpc v1.72.2/go.mod h1:wH5Aktxcg25y1I3w7H69nHfXdOG3UiadoBtjh3izSDM=
google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw= google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.1.0/go.mod h1:6Kw0yEErY5E/yWrBtf03jp27GLLJujG4z/JK95pnjjw=
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

View File

@ -186,23 +186,15 @@ func (r *delegatingResolver) Close() {
r.proxyResolver = nil r.proxyResolver = nil
} }
func networkTypeFromAddr(addr resolver.Address) string { func needsProxyResolver(state *resolver.State) bool {
networkType, ok := networktype.Get(addr)
if !ok {
networkType, _ = transport.ParseDialTarget(addr.Addr)
}
return networkType
}
func isTCPAddressPresent(state *resolver.State) bool {
for _, addr := range state.Addresses { for _, addr := range state.Addresses {
if networkType := networkTypeFromAddr(addr); networkType == "tcp" { if !skipProxy(addr) {
return true return true
} }
} }
for _, endpoint := range state.Endpoints { for _, endpoint := range state.Endpoints {
for _, addr := range endpoint.Addresses { for _, addr := range endpoint.Addresses {
if networktype := networkTypeFromAddr(addr); networktype == "tcp" { if !skipProxy(addr) {
return true return true
} }
} }
@ -210,6 +202,29 @@ func isTCPAddressPresent(state *resolver.State) bool {
return false return false
} }
func skipProxy(address resolver.Address) bool {
// Avoid proxy when network is not tcp.
networkType, ok := networktype.Get(address)
if !ok {
networkType, _ = transport.ParseDialTarget(address.Addr)
}
if networkType != "tcp" {
return true
}
req := &http.Request{URL: &url.URL{
Scheme: "https",
Host: address.Addr,
}}
// Avoid proxy when address included in `NO_PROXY` environment variable or
// fails to get the proxy address.
url, err := HTTPSProxyFromEnvironment(req)
if err != nil || url == nil {
return true
}
return false
}
// updateClientConnStateLocked constructs a combined list of addresses by // updateClientConnStateLocked constructs a combined list of addresses by
// pairing each proxy address with every target address of type TCP. For each // pairing each proxy address with every target address of type TCP. For each
// pair, it creates a new [resolver.Address] using the proxy address and // pair, it creates a new [resolver.Address] using the proxy address and
@ -240,8 +255,7 @@ func (r *delegatingResolver) updateClientConnStateLocked() error {
} }
var addresses []resolver.Address var addresses []resolver.Address
for _, targetAddr := range (*r.targetResolverState).Addresses { for _, targetAddr := range (*r.targetResolverState).Addresses {
// Avoid proxy when network is not tcp. if skipProxy(targetAddr) {
if networkType := networkTypeFromAddr(targetAddr); networkType != "tcp" {
addresses = append(addresses, targetAddr) addresses = append(addresses, targetAddr)
continue continue
} }
@ -259,7 +273,7 @@ func (r *delegatingResolver) updateClientConnStateLocked() error {
var addrs []resolver.Address var addrs []resolver.Address
for _, targetAddr := range endpt.Addresses { for _, targetAddr := range endpt.Addresses {
// Avoid proxy when network is not tcp. // Avoid proxy when network is not tcp.
if networkType := networkTypeFromAddr(targetAddr); networkType != "tcp" { if skipProxy(targetAddr) {
addrs = append(addrs, targetAddr) addrs = append(addrs, targetAddr)
continue continue
} }
@ -340,9 +354,10 @@ func (r *delegatingResolver) updateTargetResolverState(state resolver.State) err
logger.Infof("Addresses received from target resolver: %v", state.Addresses) logger.Infof("Addresses received from target resolver: %v", state.Addresses)
} }
r.targetResolverState = &state r.targetResolverState = &state
// If no addresses returned by resolver have network type as tcp , do not // If all addresses returned by the target resolver have a non-TCP network
// wait for proxy update. // type, or are listed in the `NO_PROXY` environment variable, do not wait
if !isTCPAddressPresent(r.targetResolverState) { // for proxy update.
if !needsProxyResolver(r.targetResolverState) {
return r.cc.UpdateState(*r.targetResolverState) return r.cc.UpdateState(*r.targetResolverState)
} }

View File

@ -19,4 +19,4 @@
package grpc package grpc
// Version is the current grpc version. // Version is the current grpc version.
const Version = "1.72.1" const Version = "1.72.2"

2
vendor/modules.txt vendored
View File

@ -593,7 +593,7 @@ gomodules.xyz/jsonpatch/v2
# google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a # google.golang.org/genproto/googleapis/rpc v0.0.0-20250218202821-56aae31c358a
## explicit; go 1.22 ## explicit; go 1.22
google.golang.org/genproto/googleapis/rpc/status google.golang.org/genproto/googleapis/rpc/status
# google.golang.org/grpc v1.72.1 # google.golang.org/grpc v1.72.2
## explicit; go 1.23 ## explicit; go 1.23
google.golang.org/grpc google.golang.org/grpc
google.golang.org/grpc/attributes google.golang.org/grpc/attributes