diff --git a/go.mod b/go.mod index 7270d34da..b597e5730 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( k8s.io/api v0.29.2 k8s.io/apimachinery v0.29.2 k8s.io/client-go v0.29.2 - knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f - knative.dev/hack v0.0.0-20240801232131-441a19fc9ead - knative.dev/pkg v0.0.0-20240805063731-c88d5dad9653 - knative.dev/serving v0.42.1-0.20240806121737-73f88b255f5f + knative.dev/eventing v0.42.1-0.20240809130604-d69b8b46e9d0 + knative.dev/hack v0.0.0-20240808014239-452e340cbb4b + knative.dev/pkg v0.0.0-20240808013630-0991b2f920f4 + knative.dev/serving v0.42.1-0.20240809122229-bf7dbbb46c4f ) require ( diff --git a/go.sum b/go.sum index 141228552..8c2da707f 100644 --- a/go.sum +++ b/go.sum @@ -789,16 +789,16 @@ k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 h1:aVUu9fTY98ivBPKR9Y5w/A k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00/go.mod h1:AsvuZPBlUDVuCdzJ87iajxtXuR9oktsTctW/R9wwouA= k8s.io/utils v0.0.0-20240102154912-e7106e64919e h1:eQ/4ljkx21sObifjzXwlPKpdGLrCfRziVtos3ofG/sQ= k8s.io/utils v0.0.0-20240102154912-e7106e64919e/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0= -knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f h1:nxcX0qPKzBc/n+gFEhT2sWTnT5xbRdx1QH8TPsXMxqM= -knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f/go.mod h1:sW8btFd57JF2hS2T92Jh/k1PgSOVTQdPzZODXaQs54E= -knative.dev/hack v0.0.0-20240801232131-441a19fc9ead h1:ViH1OEO0LViKa6W61YKUpLzOp7CJCFL9yLyIojHIuQ8= -knative.dev/hack v0.0.0-20240801232131-441a19fc9ead/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= +knative.dev/eventing v0.42.1-0.20240809130604-d69b8b46e9d0 h1:tloWYPTFdfwfV+XUK6oVGk7CIrcNrqhrhoXhqk5RAUc= +knative.dev/eventing v0.42.1-0.20240809130604-d69b8b46e9d0/go.mod h1:sW8btFd57JF2hS2T92Jh/k1PgSOVTQdPzZODXaQs54E= +knative.dev/hack v0.0.0-20240808014239-452e340cbb4b h1:pDzlX6d8cCbp5PDU9BdEIPJVI/4HLTM4mV2gMN1bKlk= +knative.dev/hack v0.0.0-20240808014239-452e340cbb4b/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY= knative.dev/networking v0.0.0-20240802083044-f1702380495f h1:1mIVNRZELhQLuDDFti6R26ZQXqeL2UkS/K0cMqKzBxw= knative.dev/networking v0.0.0-20240802083044-f1702380495f/go.mod h1:FNWuEcSif270xzNwQx5xFvEsv7wKiKGPUKzpAXkajT8= -knative.dev/pkg v0.0.0-20240805063731-c88d5dad9653 h1:VHUW124ZpkDn4EnIzMuGWvGuJte3ISIoHMmEw2kx0zU= -knative.dev/pkg v0.0.0-20240805063731-c88d5dad9653/go.mod h1:H+5rS2GEWpAZzrmQoXOEVq/1M77LLMhR7+4jZBMOQ24= -knative.dev/serving v0.42.1-0.20240806121737-73f88b255f5f h1:yBlSzaLPKHuP0q/uhdrCPr7S99ZjrrqRpbnOrA6+3r0= -knative.dev/serving v0.42.1-0.20240806121737-73f88b255f5f/go.mod h1:gHq0Gm9DC2Kx4HwXFZKH4IcC9sXgoVln9AP93OYFujQ= +knative.dev/pkg v0.0.0-20240808013630-0991b2f920f4 h1:ao+O7yRAMHJmW9f/1YaCv+YTg8WlCRUwo08B9QQGvqw= +knative.dev/pkg v0.0.0-20240808013630-0991b2f920f4/go.mod h1:H+5rS2GEWpAZzrmQoXOEVq/1M77LLMhR7+4jZBMOQ24= +knative.dev/serving v0.42.1-0.20240809122229-bf7dbbb46c4f h1:ssRNiHY5XouaZ45y9sgeyw4Pvsb+UwMIBL1Z7PtNvDQ= +knative.dev/serving v0.42.1-0.20240809122229-bf7dbbb46c4f/go.mod h1:gHq0Gm9DC2Kx4HwXFZKH4IcC9sXgoVln9AP93OYFujQ= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/eventpolicy_defaults.go b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/eventpolicy_defaults.go index 3e52f5bd4..4514e4c03 100644 --- a/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/eventpolicy_defaults.go +++ b/vendor/knative.dev/eventing/pkg/apis/eventing/v1alpha1/eventpolicy_defaults.go @@ -28,4 +28,14 @@ func (ep *EventPolicy) SetDefaults(ctx context.Context) { } func (ets *EventPolicySpec) SetDefaults(ctx context.Context) { + for i := range ets.From { + ets.From[i].SetDefaults(ctx) + } +} + +func (from *EventPolicySpecFrom) SetDefaults(ctx context.Context) { + if from.Ref != nil && from.Ref.Namespace == "" { + // default to event policies namespace + from.Ref.Namespace = apis.ParentMeta(ctx).Namespace + } } diff --git a/vendor/knative.dev/eventing/pkg/auth/event_policy.go b/vendor/knative.dev/eventing/pkg/auth/event_policy.go index 7d4fcb1db..d86351674 100644 --- a/vendor/knative.dev/eventing/pkg/auth/event_policy.go +++ b/vendor/knative.dev/eventing/pkg/auth/event_policy.go @@ -18,6 +18,7 @@ package auth import ( "fmt" + "sort" "strings" eventingduckv1 "knative.dev/eventing/pkg/apis/duck/v1" @@ -93,6 +94,11 @@ func GetEventPoliciesForResource(lister listerseventingv1alpha1.EventPolicyListe } } + // Sort the policies by name to ensure deterministic order + sort.Slice(relevantPolicies, func(i, j int) bool { + return relevantPolicies[i].Name < relevantPolicies[j].Name + }) + return relevantPolicies, nil } diff --git a/vendor/modules.txt b/vendor/modules.txt index d0c4de315..a77ae6977 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -967,7 +967,7 @@ k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/strings/slices k8s.io/utils/trace -# knative.dev/eventing v0.42.1-0.20240801183138-ff37e4e2fc0f +# knative.dev/eventing v0.42.1-0.20240809130604-d69b8b46e9d0 ## explicit; go 1.22 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -1055,7 +1055,7 @@ knative.dev/eventing/pkg/observability knative.dev/eventing/pkg/observability/client knative.dev/eventing/pkg/reconciler/resources knative.dev/eventing/pkg/reconciler/source -# knative.dev/hack v0.0.0-20240801232131-441a19fc9ead +# knative.dev/hack v0.0.0-20240808014239-452e340cbb4b ## explicit; go 1.21 knative.dev/hack # knative.dev/networking v0.0.0-20240802083044-f1702380495f @@ -1063,7 +1063,7 @@ knative.dev/hack knative.dev/networking/pkg/apis/networking knative.dev/networking/pkg/apis/networking/v1alpha1 knative.dev/networking/pkg/config -# knative.dev/pkg v0.0.0-20240805063731-c88d5dad9653 +# knative.dev/pkg v0.0.0-20240808013630-0991b2f920f4 ## explicit; go 1.22 knative.dev/pkg/apis knative.dev/pkg/apis/duck @@ -1117,7 +1117,7 @@ knative.dev/pkg/tracker knative.dev/pkg/version knative.dev/pkg/webhook knative.dev/pkg/webhook/certificates/resources -# knative.dev/serving v0.42.1-0.20240806121737-73f88b255f5f +# knative.dev/serving v0.42.1-0.20240809122229-bf7dbbb46c4f ## explicit; go 1.22 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1