diff --git a/go.mod b/go.mod index d33be9845..014c8db11 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( k8s.io/apimachinery v0.35.2 k8s.io/client-go v0.35.2 k8s.io/code-generator v0.35.2 - knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f + knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580 knative.dev/hack v0.0.0-20260212092700-0126b283bf20 knative.dev/pkg v0.0.0-20260304131155-a902bbfa38de knative.dev/serving v0.48.1-0.20260305234456-cff52112997b diff --git a/go.sum b/go.sum index c565c8c63..9f4164226 100644 --- a/go.sum +++ b/go.sum @@ -364,8 +364,8 @@ 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.20260305172655-d9ba4018408f h1:ekZyAqGBSmtc1+PkBYWphpKweKO2VeJcn3EdNgg6NjY= -knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f/go.mod h1:HseSdM0vR//gaW5g0+iU1ApPJZ1mInL+A7DD8kef1sU= +knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580 h1:od9I7V8i6/qVwT14CKRTX+k22JXMLNPZVa5oY/HdF0w= +knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580/go.mod h1:HseSdM0vR//gaW5g0+iU1ApPJZ1mInL+A7DD8kef1sU= knative.dev/hack v0.0.0-20260212092700-0126b283bf20 h1:Ocya6ILPQxGrozD5gPELC4J2ASnqvTLvYGJjddKr4Fs= knative.dev/hack v0.0.0-20260212092700-0126b283bf20/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= knative.dev/networking v0.0.0-20260303015753-965e7c322093 h1:s+HccZPL2A5cBb2FU5CUQ8qJ54LQN5oYK1vtcy94W+M= diff --git a/vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go b/vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go index 2be29447c..5b6643194 100644 --- a/vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go +++ b/vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go @@ -190,7 +190,8 @@ func PropagateTrustBundles(ctx context.Context, k8s kubernetes.Interface, trustB if !equality.Semantic.DeepDerivative(expected.Data, p.userCm.Data) || !equality.Semantic.DeepDerivative(expected.BinaryData, p.userCm.BinaryData) || - !equality.Semantic.DeepDerivative(expected.Labels, p.userCm.Labels) { + !equality.Semantic.DeepDerivative(expected.Labels, p.userCm.Labels) || + !equality.Semantic.DeepDerivative(expected.OwnerReferences, p.userCm.OwnerReferences) { if err := updateConfigMap(ctx, k8s, expected); err != nil { return nil, err } @@ -309,7 +310,14 @@ func AddTrustBundleVolumesFromConfigMaps(cms []*corev1.ConfigMap, pt *corev1.Pod } func combineValidTrustBundles(configMaps []*corev1.ConfigMap, combinedBundle *bytes.Buffer) error { - for _, cm := range configMaps { + // Create a sorted copy of configMaps to ensure consistent ordering without modifying the input slice + sortedCMs := make([]*corev1.ConfigMap, len(configMaps)) + copy(sortedCMs, configMaps) + sort.SliceStable(sortedCMs, func(i, j int) bool { + return sortedCMs[i].Name < sortedCMs[j].Name + }) + + for _, cm := range sortedCMs { // Ensure the combined bundle is always composed in the same order. keys := make([]string, 0, len(cm.Data)) diff --git a/vendor/modules.txt b/vendor/modules.txt index fd112f6c1..2b2d06d7b 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1124,7 +1124,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f +# knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580 ## explicit; go 1.24.0 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/test