Skip to content

[main] Upgrade to latest dependencies #674

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
knative-prow merged 1 commit into from
Mar 6, 2026
Merged

[main] Upgrade to latest dependencies #674

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down
12 changes: 10 additions & 2 deletions vendor/knative.dev/eventing/pkg/eventingtls/trust_bundle.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
Expand Down Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading