Skip to content

Commit 1f4342f

Browse files
upgrade to latest dependencies
bumping knative.dev/eventing d9ba401...9a2d0c6: > 9a2d0c6 consistent order for the combined trust bundle (# 8899) Signed-off-by: Knative Automation <automation@knative.team>
1 parent d086b01 commit 1f4342f

4 files changed

Lines changed: 14 additions & 6 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ require (
1515
k8s.io/apimachinery v0.35.2
1616
k8s.io/client-go v0.35.2
1717
k8s.io/code-generator v0.35.2
18-
knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f
18+
knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580
1919
knative.dev/hack v0.0.0-20260212092700-0126b283bf20
2020
knative.dev/pkg v0.0.0-20260304131155-a902bbfa38de
2121
knative.dev/serving v0.48.1-0.20260305234456-cff52112997b

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -364,8 +364,8 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
364364
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
365365
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
366366
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
367-
knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f h1:ekZyAqGBSmtc1+PkBYWphpKweKO2VeJcn3EdNgg6NjY=
368-
knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f/go.mod h1:HseSdM0vR//gaW5g0+iU1ApPJZ1mInL+A7DD8kef1sU=
367+
knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580 h1:od9I7V8i6/qVwT14CKRTX+k22JXMLNPZVa5oY/HdF0w=
368+
knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580/go.mod h1:HseSdM0vR//gaW5g0+iU1ApPJZ1mInL+A7DD8kef1sU=
369369
knative.dev/hack v0.0.0-20260212092700-0126b283bf20 h1:Ocya6ILPQxGrozD5gPELC4J2ASnqvTLvYGJjddKr4Fs=
370370
knative.dev/hack v0.0.0-20260212092700-0126b283bf20/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
371371
knative.dev/networking v0.0.0-20260303015753-965e7c322093 h1:s+HccZPL2A5cBb2FU5CUQ8qJ54LQN5oYK1vtcy94W+M=

vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,8 @@ func PropagateTrustBundles(ctx context.Context, k8s kubernetes.Interface, trustB
190190

191191
if !equality.Semantic.DeepDerivative(expected.Data, p.userCm.Data) ||
192192
!equality.Semantic.DeepDerivative(expected.BinaryData, p.userCm.BinaryData) ||
193-
!equality.Semantic.DeepDerivative(expected.Labels, p.userCm.Labels) {
193+
!equality.Semantic.DeepDerivative(expected.Labels, p.userCm.Labels) ||
194+
!equality.Semantic.DeepDerivative(expected.OwnerReferences, p.userCm.OwnerReferences) {
194195
if err := updateConfigMap(ctx, k8s, expected); err != nil {
195196
return nil, err
196197
}
@@ -309,7 +310,14 @@ func AddTrustBundleVolumesFromConfigMaps(cms []*corev1.ConfigMap, pt *corev1.Pod
309310
}
310311

311312
func combineValidTrustBundles(configMaps []*corev1.ConfigMap, combinedBundle *bytes.Buffer) error {
312-
for _, cm := range configMaps {
313+
// Create a sorted copy of configMaps to ensure consistent ordering without modifying the input slice
314+
sortedCMs := make([]*corev1.ConfigMap, len(configMaps))
315+
copy(sortedCMs, configMaps)
316+
sort.SliceStable(sortedCMs, func(i, j int) bool {
317+
return sortedCMs[i].Name < sortedCMs[j].Name
318+
})
319+
320+
for _, cm := range sortedCMs {
313321

314322
// Ensure the combined bundle is always composed in the same order.
315323
keys := make([]string, 0, len(cm.Data))

vendor/modules.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1124,7 +1124,7 @@ k8s.io/utils/net
11241124
k8s.io/utils/pointer
11251125
k8s.io/utils/ptr
11261126
k8s.io/utils/trace
1127-
# knative.dev/eventing v0.48.1-0.20260305172655-d9ba4018408f
1127+
# knative.dev/eventing v0.48.1-0.20260306082258-9a2d0c67d580
11281128
## explicit; go 1.24.0
11291129
knative.dev/eventing/pkg/adapter/v2
11301130
knative.dev/eventing/pkg/adapter/v2/test

0 commit comments

Comments
 (0)