From a47562a8cb5b925de3a3810dd1816149f23a134e Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Tue, 7 Oct 2025 01:40:33 +0000 Subject: [PATCH] upgrade to latest dependencies bumping k8s.io/api 2daa873...d826fc1: > d826fc1 Update dependencies to v0.33.5 tag bumping k8s.io/code-generator 6bf3bd8...2a37835: > 2a37835 Update dependencies to v0.33.5 tag bumping k8s.io/client-go 9c62a4c...eb437e3: > eb437e3 Update dependencies to v0.33.5 tag bumping k8s.io/apimachinery 173776a...173776a: bumping knative.dev/pkg db4c336...e53fcbb: > e53fcbb log context cancellation as debug instead of error (# 3268) > 1e71536 Bump the k8s group with 5 updates (# 3266) > d38c7a0 Update dependabot config so we only get k8s patch updates (# 3265) Signed-off-by: Knative Automation --- go.mod | 10 +++++----- go.sum | 20 +++++++++---------- .../knative.dev/pkg/network/error_handler.go | 6 ++++++ vendor/modules.txt | 10 +++++----- 4 files changed, 26 insertions(+), 20 deletions(-) diff --git a/go.mod b/go.mod index 01ab003aa..d8ab435e3 100644 --- a/go.mod +++ b/go.mod @@ -5,13 +5,13 @@ go 1.24.0 require ( github.com/google/go-cmp v0.7.0 go.uber.org/zap v1.27.0 - k8s.io/api v0.33.4 - k8s.io/apimachinery v0.33.4 - k8s.io/client-go v0.33.4 - k8s.io/code-generator v0.33.4 + k8s.io/api v0.33.5 + k8s.io/apimachinery v0.33.5 + k8s.io/client-go v0.33.5 + k8s.io/code-generator v0.33.5 k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff knative.dev/hack v0.0.0-20250902153942-1499de21e119 - knative.dev/pkg v0.0.0-20250915135827-db4c336acdbe + knative.dev/pkg v0.0.0-20251007000110-e53fcbb06907 ) require ( diff --git a/go.sum b/go.sum index d002ee707..adb6ba9af 100644 --- a/go.sum +++ b/go.sum @@ -168,14 +168,14 @@ gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -k8s.io/api v0.33.4 h1:oTzrFVNPXBjMu0IlpA2eDDIU49jsuEorGHB4cvKupkk= -k8s.io/api v0.33.4/go.mod h1:VHQZ4cuxQ9sCUMESJV5+Fe8bGnqAARZ08tSTdHWfeAc= -k8s.io/apimachinery v0.33.4 h1:SOf/JW33TP0eppJMkIgQ+L6atlDiP/090oaX0y9pd9s= -k8s.io/apimachinery v0.33.4/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= -k8s.io/client-go v0.33.4 h1:TNH+CSu8EmXfitntjUPwaKVPN0AYMbc9F1bBS8/ABpw= -k8s.io/client-go v0.33.4/go.mod h1:LsA0+hBG2DPwovjd931L/AoaezMPX9CmBgyVyBZmbCY= -k8s.io/code-generator v0.33.4 h1:DiA801QxqApRIBh3OWULasVAUA237XnYvFNMh+E34Y8= -k8s.io/code-generator v0.33.4/go.mod h1:ifWxKWhEl/Z1K7WmWAyOBEf3ex/i546ingCzLC8YVIY= +k8s.io/api v0.33.5 h1:YR+uhYj05jdRpcksv8kjSliW+v9hwXxn6Cv10aR8Juw= +k8s.io/api v0.33.5/go.mod h1:2gzShdwXKT5yPGiqrTrn/U/nLZ7ZyT4WuAj3XGDVgVs= +k8s.io/apimachinery v0.33.5 h1:NiT64hln4TQXeYR18/ES39OrNsjGz8NguxsBgp+6QIo= +k8s.io/apimachinery v0.33.5/go.mod h1:BHW0YOu7n22fFv/JkYOEfkUYNRN0fj0BlvMFWA7b+SM= +k8s.io/client-go v0.33.5 h1:I8BdmQGxInpkMEnJvV6iG7dqzP3JRlpZZlib3OMFc3o= +k8s.io/client-go v0.33.5/go.mod h1:W8PQP4MxbM4ypgagVE65mUUqK1/ByQkSALF9tzuQ6u0= +k8s.io/code-generator v0.33.5 h1:KwkOvhwAaorjSwF2MQhhdhL3i8bBmAal/TWhX67kdHw= +k8s.io/code-generator v0.33.5/go.mod h1:Ra+sdZquRakeTGcEnQAPw6BmlZ92IvxwQQTX/XOvOIE= k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 h1:2OX19X59HxDprNCVrWi6jb7LW1PoqTlYqEq5H2oetog= k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7/go.mod h1:EJykeLsmFC60UQbYJezXkEsG2FLrt0GPNkU5iK5GWxU= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= @@ -186,8 +186,8 @@ k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJ k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= knative.dev/hack v0.0.0-20250902153942-1499de21e119 h1:NbQvjnFK1tL489LN0qAybWy0E17Jpziwcv/XIHwfp6M= knative.dev/hack v0.0.0-20250902153942-1499de21e119/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= -knative.dev/pkg v0.0.0-20250915135827-db4c336acdbe h1:VCVC/izQ5iIRWti36s1zTuRJPcnK3fSVpnB3Li4b24Y= -knative.dev/pkg v0.0.0-20250915135827-db4c336acdbe/go.mod h1:MWTdkANYm1VBSd7O33Q8Uwr9nDsrBehnVNDVPbshy7s= +knative.dev/pkg v0.0.0-20251007000110-e53fcbb06907 h1:VLOZyx36YxqPpF3yLJLA+Anl8pq9jUFzkxcuagjalvI= +knative.dev/pkg v0.0.0-20251007000110-e53fcbb06907/go.mod h1:p/qvGtUWf559vUPEQ7Q5uWOSLLsj1Kn9qGjI/BAuoHM= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE= sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg= sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY= diff --git a/vendor/knative.dev/pkg/network/error_handler.go b/vendor/knative.dev/pkg/network/error_handler.go index d0b6beedc..309432bda 100644 --- a/vendor/knative.dev/pkg/network/error_handler.go +++ b/vendor/knative.dev/pkg/network/error_handler.go @@ -17,6 +17,8 @@ limitations under the License. package network import ( + "context" + "errors" "net/http" "os" @@ -29,6 +31,10 @@ import ( // Deprecated: Use handler.Error instead. func ErrorHandler(logger *zap.SugaredLogger) func(http.ResponseWriter, *http.Request, error) { return func(w http.ResponseWriter, req *http.Request, err error) { + if errors.Is(err, context.Canceled) { + logger.Debugw("request context canceled", zap.Error(err)) + return + } ss := readSockStat(logger) logger.Errorw("error reverse proxying request; sockstat: "+ss, zap.Error(err)) http.Error(w, err.Error(), http.StatusBadGateway) diff --git a/vendor/modules.txt b/vendor/modules.txt index 2b0be15f9..23f23bf85 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -246,7 +246,7 @@ gopkg.in/inf.v0 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.33.4 +# k8s.io/api v0.33.5 ## explicit; go 1.24.0 k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1alpha1 @@ -305,7 +305,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1alpha1 -# k8s.io/apimachinery v0.33.4 +# k8s.io/apimachinery v0.33.5 ## explicit; go 1.24.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -361,7 +361,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.33.4 +# k8s.io/client-go v0.33.5 ## explicit; go 1.24.0 k8s.io/client-go/applyconfigurations/admissionregistration/v1 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1 @@ -636,7 +636,7 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/watchlist k8s.io/client-go/util/workqueue -# k8s.io/code-generator v0.33.4 +# k8s.io/code-generator v0.33.5 ## explicit; go 1.24.0 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -721,7 +721,7 @@ k8s.io/utils/trace # knative.dev/hack v0.0.0-20250902153942-1499de21e119 ## explicit; go 1.21 knative.dev/hack -# knative.dev/pkg v0.0.0-20250915135827-db4c336acdbe +# knative.dev/pkg v0.0.0-20251007000110-e53fcbb06907 ## explicit; go 1.24.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck