From e07d19944f5be3b46a8b5b6e4045dcd0bd1c822f Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Mon, 20 Apr 2026 13:54:36 +0000 Subject: [PATCH] upgrade to latest dependencies bumping k8s.io/code-generator d656d0d...dbc8933: > dbc8933 Update dependencies to v0.35.4 tag > cb0dd49 Merge pull request # 138356 from dims/update-moby-spdystream-v0.5.1-1.35 > b99401c Update github.com/moby/spdystream from v0.5.0 to v0.5.1 > 52e49d4 Merge pull request # 137927 from lalitc375/cherry-pick-137864 > 1e02847 Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha) > f76e992 Add slice and map union member support with tests > a71a093 Add nil OldValue test coverage for union doc_tests bumping k8s.io/client-go 4f1f0a2...d43aed2: > d43aed2 Update dependencies to v0.35.4 tag > 8ebd9bb Merge pull request # 138356 from dims/update-moby-spdystream-v0.5.1-1.35 > 00b2f2b Update github.com/moby/spdystream from v0.5.0 to v0.5.1 bumping k8s.io/apimachinery 72d71ea...475c941: > 475c941 Merge pull request # 138356 from dims/update-moby-spdystream-v0.5.1-1.35 > 6c08bb5 Update github.com/moby/spdystream from v0.5.0 to v0.5.1 > 45398ef Merge pull request # 137927 from lalitc375/cherry-pick-137864 > b414b94 Fix backport differences for 1.35 (remove WithOrigin and MarkAlpha) > f933a4d Add slice and map union member support with tests > 977ad5b Use IsZero instead of IsNil for union ratcheting check > a128230 Fix union validation ratcheting when oldObj is nil bumping k8s.io/api 3897036...e8f0e9f: > e8f0e9f Update dependencies to v0.35.4 tag > 0b2a75e Merge pull request # 138356 from dims/update-moby-spdystream-v0.5.1-1.35 > e1ef9bc Update github.com/moby/spdystream from v0.5.0 to v0.5.1 bumping k8s.io/apiextensions-apiserver 073f527...b0e553c: > b0e553c Update dependencies to v0.35.4 tag > c580382 Merge pull request # 138356 from dims/update-moby-spdystream-v0.5.1-1.35 > 895a1c1 Merge pull request # 138348 from dashpole/update_prop_35 > d25970d Update github.com/moby/spdystream from v0.5.0 to v0.5.1 > eacefa7 update go.opentelemetry.io/otel to v1.41.0 bumping knative.dev/eventing ae92548...c76e74e: > c76e74e Update http links to https (# 9028) > f8aee7f Fix spelling mistakes in comments, docs, and error strings (# 9025) > b2c6dab [Automated] Update eventing-eventing-integrations nightly (# 9027) > 875cc6d [main] Upgrade to latest dependencies (# 9024) bumping knative.dev/pkg a395c10...3cd6d60: > 3cd6d60 Bump the k8s group with 5 updates (# 3347) > 2b1e898 [main] Upgrade to latest dependencies (# 3346) Signed-off-by: Knative Automation --- go.mod | 14 ++++---- go.sum | 32 +++++++++---------- .../apimachinery/pkg/api/validate/union.go | 15 +++++++-- .../pkg/apis/eventing/v1alpha1/register.go | 2 +- .../eventing/pkg/apis/sources/register.go | 10 +++--- .../pkg/apis/sources/v1/apiserver_types.go | 2 +- .../eventing/pkg/observability/key.go | 2 +- vendor/modules.txt | 14 ++++---- 8 files changed, 51 insertions(+), 40 deletions(-) diff --git a/go.mod b/go.mod index 63c0b6bc6..7bf334251 100644 --- a/go.mod +++ b/go.mod @@ -9,12 +9,12 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/stretchr/testify v1.11.1 go.uber.org/zap v1.27.1 - k8s.io/api v0.35.3 - k8s.io/apimachinery v0.35.3 - k8s.io/client-go v0.35.3 - knative.dev/eventing v0.48.1-0.20260416124637-ae92548e56ea + k8s.io/api v0.35.4 + k8s.io/apimachinery v0.35.4 + k8s.io/client-go v0.35.4 + knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85 knative.dev/hack v0.0.0-20260416140237-504af4d2178f - knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d + knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 ) require ( @@ -100,8 +100,8 @@ require ( gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect - k8s.io/apiextensions-apiserver v0.35.3 // indirect - k8s.io/code-generator v0.35.3 // indirect + k8s.io/apiextensions-apiserver v0.35.4 // indirect + k8s.io/code-generator v0.35.4 // indirect k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect diff --git a/go.sum b/go.sum index d97c91e78..1ed8c27b3 100644 --- a/go.sum +++ b/go.sum @@ -328,18 +328,18 @@ gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= 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.35.3 h1:pA2fiBc6+N9PDf7SAiluKGEBuScsTzd2uYBkA5RzNWQ= -k8s.io/api v0.35.3/go.mod h1:9Y9tkBcFwKNq2sxwZTQh1Njh9qHl81D0As56tu42GA4= -k8s.io/apiextensions-apiserver v0.35.3 h1:2fQUhEO7P17sijylbdwt0nBdXP0TvHrHj0KeqHD8FiU= -k8s.io/apiextensions-apiserver v0.35.3/go.mod h1:tK4Kz58ykRpwAEkXUb634HD1ZAegEElktz/B3jgETd8= -k8s.io/apimachinery v0.35.3 h1:MeaUwQCV3tjKP4bcwWGgZ/cp/vpsRnQzqO6J6tJyoF8= -k8s.io/apimachinery v0.35.3/go.mod h1:jQCgFZFR1F4Ik7hvr2g84RTJSZegBc8yHgFWKn//hns= -k8s.io/apiserver v0.35.3 h1:D2eIcfJ05hEAEewoSDg+05e0aSRwx8Y4Agvd/wiomUI= -k8s.io/apiserver v0.35.3/go.mod h1:JI0n9bHYzSgIxgIrfe21dbduJ9NHzKJ6RchcsmIKWKY= -k8s.io/client-go v0.35.3 h1:s1lZbpN4uI6IxeTM2cpdtrwHcSOBML1ODNTCCfsP1pg= -k8s.io/client-go v0.35.3/go.mod h1:RzoXkc0mzpWIDvBrRnD+VlfXP+lRzqQjCmKtiwZ8Q9c= -k8s.io/code-generator v0.35.3 h1:NDGCLkEm6Ho65wTdSe2EgErmmtsrezOPwwOchlNc6FQ= -k8s.io/code-generator v0.35.3/go.mod h1:LAVriRGXQusHQ0Ns64SE1ublSswm1KrK7cXn0GuQETg= +k8s.io/api v0.35.4 h1:P7nFYKl5vo9AGUp1Z+Pmd3p2tA7bX2wbFWCvDeRv988= +k8s.io/api v0.35.4/go.mod h1:yl4lqySWOgYJJf9RERXKUwE9g2y+CkuwG+xmcOK8wXU= +k8s.io/apiextensions-apiserver v0.35.4 h1:HeP+Upp7ItdvnyGmub0yoix+2z5+ev4M5cE5TCgtOUU= +k8s.io/apiextensions-apiserver v0.35.4/go.mod h1:ogQlk+stIE8mnoRthSYCwlOS12fVqgWFiErMwPaXA7c= +k8s.io/apimachinery v0.35.4 h1:xtdom9RG7e+yDp71uoXoJDWEE2eOiHgeO4GdBzwWpds= +k8s.io/apimachinery v0.35.4/go.mod h1:NNi1taPOpep0jOj+oRha3mBJPqvi0hGdaV8TCqGQ+cc= +k8s.io/apiserver v0.35.4 h1:vtuFqNFmF9bPRdHDL2lpK6qCTPWDreZJL4LRPwVM6ho= +k8s.io/apiserver v0.35.4/go.mod h1:JnBcb+J8kFXKpZkgcbcUnPBBHi4qgBii1I7dLxFY/oo= +k8s.io/client-go v0.35.4 h1:DN6fyaGuzK64UvnKO5fOA6ymSjvfGAnCAHAR0C66kD8= +k8s.io/client-go v0.35.4/go.mod h1:2Pg9WpsS4NeOpoYTfHHfMxBG8zFMSAUi4O/qoiJC3nY= +k8s.io/code-generator v0.35.4 h1:i0FfiXAeUMBlHarjVk5ZWf6Wjsg3YJpNYmOg0nPk6r4= +k8s.io/code-generator v0.35.4/go.mod h1:rwLDdemFgPK6dGlLFHPUieyekgAlV1x8IVafjAy/ELA= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b h1:gMplByicHV/TJBizHd9aVEsTYoJBnnUAT5MHlTkbjhQ= k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b/go.mod h1:CgujABENc3KuTrcsdpGmrrASjtQsWCT7R99mEV4U/fM= k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk= @@ -348,12 +348,12 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck= k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.48.1-0.20260416124637-ae92548e56ea h1:57Dlmv3YBGC4hl7cRuHyMpeQvmNVDWXdA5NESQjEtLg= -knative.dev/eventing v0.48.1-0.20260416124637-ae92548e56ea/go.mod h1:KIndP2eQs3iT6L57oQZFWuWXa+oOGIQFRBIDluLQRLE= +knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85 h1:cIbAhw6JuoljtfWHaGR7LadmdZFaARe3JUvvIqAXsmU= +knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85/go.mod h1:LHawjeS2AS4KfEb91YyY0wzyPmGu8fUjJU3wP7ANQ1E= knative.dev/hack v0.0.0-20260416140237-504af4d2178f h1:YTht2cGdhd++kSrhwcDutWpk1V1bi0vKpAs0h4xIjpw= knative.dev/hack v0.0.0-20260416140237-504af4d2178f/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= -knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d h1:u9tHGBMUh1CYgZOdIBxeXpjvEPNIXT/rCjWVFUtzzs8= -knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d/go.mod h1:SvS4U6mNzjdSvasGVgnuox9eKsG9INWroDcpBo0wFnE= +knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 h1:rTbIPgPE5j8ptHoDXBoiabWJCQeC1F1lPFtlN/wrQek= +knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35/go.mod h1:VtAr0jJJtx6qqoVx5eNd8YEnnsfyBE/GXPsTmp4nrtM= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= diff --git a/vendor/k8s.io/apimachinery/pkg/api/validate/union.go b/vendor/k8s.io/apimachinery/pkg/api/validate/union.go index 03f45f866..32a2671f8 100644 --- a/vendor/k8s.io/apimachinery/pkg/api/validate/union.go +++ b/vendor/k8s.io/apimachinery/pkg/api/validate/union.go @@ -19,6 +19,7 @@ package validate import ( "context" "fmt" + "reflect" "strings" "k8s.io/apimachinery/pkg/api/operation" @@ -60,6 +61,10 @@ type UnionValidationOptions struct { // )...) // return errs // } +// +// Note that T is "any", rather than "comparable", because union-members can be +// slices, meaning T might be a struct with a slice, meaning it is not +// comparable. func Union[T any](_ context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj T, union *UnionMembership, isSetFns ...ExtractorFn[T, bool]) field.ErrorList { options := UnionValidationOptions{ ErrorForEmpty: func(fldPath *field.Path, allFields []string) *field.Error { @@ -98,6 +103,10 @@ func Union[T any](_ context.Context, op operation.Operation, fldPath *field.Path // // It is not an error for the discriminatorValue to be unknown. That must be // validated on its own. +// +// Note that T is "any", rather than "comparable", because union-members can be +// slices, meaning T might be a struct with a slice, meaning it is not +// comparable. func DiscriminatedUnion[T any, D ~string](_ context.Context, op operation.Operation, fldPath *field.Path, obj, oldObj T, union *UnionMembership, discriminatorExtractor ExtractorFn[T, D], isSetFns ...ExtractorFn[T, bool]) (errs field.ErrorList) { if len(union.members) != len(isSetFns) { return field.ErrorList{ @@ -106,6 +115,7 @@ func DiscriminatedUnion[T any, D ~string](_ context.Context, op operation.Operat len(isSetFns), len(union.members))), } } + hasOldValue := !reflect.ValueOf(oldObj).IsZero() // because T is any, rather than comparable var changed bool discriminatorValue := discriminatorExtractor(obj) if op.Type == operation.Update { @@ -131,7 +141,7 @@ func DiscriminatedUnion[T any, D ~string](_ context.Context, op operation.Operat } // If the union discriminator and membership is unchanged, we don't need to // re-validate. - if op.Type == operation.Update && !changed { + if op.Type == operation.Update && hasOldValue && !changed { return nil } return errs @@ -195,6 +205,7 @@ func unionValidate[T any](op operation.Operation, fldPath *field.Path, } } + hasOldValue := !reflect.ValueOf(oldObj).IsZero() // because T is any, rather than comparable var specifiedFields []string var changed bool for i, fieldIsSet := range isSetFns { @@ -209,7 +220,7 @@ func unionValidate[T any](op operation.Operation, fldPath *field.Path, } // If the union membership is unchanged, we don't need to re-validate. - if op.Type == operation.Update && !changed { + if op.Type == operation.Update && hasOldValue && !changed { return nil } diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/register.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/register.go index 20d52b0e8..3f20655b0 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/register.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/register.go @@ -36,7 +36,7 @@ const ( RequestReplyBrokerCACertsStatusAnnotationKey = "knative.dev/brokerCACerts" // RequestReplyBrokerAudienceStatusAnnotationKey is the RequestReply status - // anotation key used to specify the broker's OIDC audience + // annotation key used to specify the broker's OIDC audience RequestReplyBrokerAudienceStatusAnnotationKey = "knative.dev/brokerAudience" ) diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/register.go b/vendor/knative.dev/eventing/pkg/apis/sources/register.go index 9f3966f6f..63d01690a 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/register.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/register.go @@ -35,30 +35,30 @@ const ( ) var ( - // ApiServerSourceResource respresents a Knative Eventing Sources ApiServerSource + // ApiServerSourceResource represents a Knative Eventing Sources ApiServerSource //nolint:staticcheck // Not capitalizing "API" ApiServerSourceResource = schema.GroupResource{ Group: GroupName, Resource: "apiserversources", } - // PingSourceResource respresents a Knative Eventing Sources PingSource + // PingSourceResource represents a Knative Eventing Sources PingSource PingSourceResource = schema.GroupResource{ Group: GroupName, Resource: "pingsources", } - // SinkBindingResource respresents a Knative Eventing Sources SinkBinding + // SinkBindingResource represents a Knative Eventing Sources SinkBinding SinkBindingResource = schema.GroupResource{ Group: GroupName, Resource: "sinkbindings", } - // ContainerSourceResource respresents a Knative Eventing Sources ContainerSource + // ContainerSourceResource represents a Knative Eventing Sources ContainerSource ContainerSourceResource = schema.GroupResource{ Group: GroupName, Resource: "containersources", } - // IntegrationSourceResource respresents a Knative Eventing Sources IntegrationSource + // IntegrationSourceResource represents a Knative Eventing Sources IntegrationSource IntegrationSourceResource = schema.GroupResource{ Group: GroupName, Resource: "integrationsources", diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go index e3d30765e..7510771f0 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1/apiserver_types.go @@ -134,7 +134,7 @@ type APIVersionKindSelector struct { // LabelSelector filters this source to objects to those resources pass the // label selector. - // More info: http://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors + // More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/#label-selectors // +optional LabelSelector *metav1.LabelSelector `json:"selector,omitempty"` } diff --git a/vendor/knative.dev/eventing/pkg/observability/key.go b/vendor/knative.dev/eventing/pkg/observability/key.go index 793c29a74..ad1d00ca6 100644 --- a/vendor/knative.dev/eventing/pkg/observability/key.go +++ b/vendor/knative.dev/eventing/pkg/observability/key.go @@ -30,7 +30,7 @@ var ( MessagingSystem = attributekey.String("messaging.system") MessagingOperationName = attributekey.String("messaging.operation.name") MessagingDestinationName = attributekey.String("messaging.destination.name") - MessagingDestinationTemplate = attributekey.String("messaging.destination.tempate") + MessagingDestinationTemplate = attributekey.String("messaging.destination.template") // attributes relating to the source SourceName = attributekey.String("kn.source.name") diff --git a/vendor/modules.txt b/vendor/modules.txt index 406e6869b..b47dcb012 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -554,7 +554,7 @@ gopkg.in/inf.v0 # gopkg.in/yaml.v3 v3.0.1 ## explicit gopkg.in/yaml.v3 -# k8s.io/api v0.35.3 +# k8s.io/api v0.35.4 ## explicit; go 1.25.0 k8s.io/api/admission/v1 k8s.io/api/admissionregistration/v1 @@ -615,11 +615,11 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 k8s.io/api/storagemigration/v1beta1 -# k8s.io/apiextensions-apiserver v0.35.3 +# k8s.io/apiextensions-apiserver v0.35.4 ## explicit; go 1.25.0 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 -# k8s.io/apimachinery v0.35.3 +# k8s.io/apimachinery v0.35.4 ## explicit; go 1.25.0 k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors @@ -680,7 +680,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.35.3 +# k8s.io/client-go v0.35.4 ## explicit; go 1.25.0 k8s.io/client-go/applyconfigurations k8s.io/client-go/applyconfigurations/admissionregistration/v1 @@ -1014,7 +1014,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.35.3 +# k8s.io/code-generator v0.35.4 ## explicit; go 1.25.0 k8s.io/code-generator k8s.io/code-generator/cmd/applyconfiguration-gen @@ -1095,7 +1095,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/eventing v0.48.1-0.20260416124637-ae92548e56ea +# knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85 ## explicit; go 1.25.0 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -1129,7 +1129,7 @@ knative.dev/eventing/pkg/utils # knative.dev/hack v0.0.0-20260416140237-504af4d2178f ## explicit; go 1.24 knative.dev/hack -# knative.dev/pkg v0.0.0-20260416015135-a395c1078b3d +# knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 ## explicit; go 1.25.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck