From c743f0c58d3622e0c080463ac08eb8be4e0299f3 Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Thu, 9 Apr 2026 13:56:43 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/eventing 263a3a5...a29cbfb: > a29cbfb revert trustbundle propagation in sb lifecycle Do (# 8985) > e88c518 [main] Upgrade to latest dependencies (# 8979) Signed-off-by: Knative Automation --- go.mod | 2 +- go.sum | 4 +- .../apis/sources/v1/sinkbinding_lifecycle.go | 42 +++---------------- vendor/modules.txt | 2 +- 4 files changed, 9 insertions(+), 41 deletions(-) diff --git a/go.mod b/go.mod index 0fa8870a3..26aeb6d0e 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( 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.20260402142557-263a3a52c638 + knative.dev/eventing v0.48.1-0.20260409081128-a29cbfbe8787 knative.dev/hack v0.0.0-20260318014029-7eede7fdcbad knative.dev/pkg v0.0.0-20260406140200-cb58ae50e894 ) diff --git a/go.sum b/go.sum index bf0b1b7f0..563377e86 100644 --- a/go.sum +++ b/go.sum @@ -348,8 +348,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.20260402142557-263a3a52c638 h1:adV90fp22meKZVTkniLyWNFG/WUdhanoE0eJPkxU9KY= -knative.dev/eventing v0.48.1-0.20260402142557-263a3a52c638/go.mod h1:Dx9hXW6bOMn3sQzZ3uVpyhI+VBZUY29+WASrCyC1C+c= +knative.dev/eventing v0.48.1-0.20260409081128-a29cbfbe8787 h1:RN2FmK08H098+NsfVd4lqnC+CL5H2DJXGfQtIofdGx4= +knative.dev/eventing v0.48.1-0.20260409081128-a29cbfbe8787/go.mod h1:/Fo2sSNODejAOySa20SYVYGy7KJi5DSi3DaArco46ik= knative.dev/hack v0.0.0-20260318014029-7eede7fdcbad h1:yH957Dv5HrPgllwTs7e1wvCKcjg/PC0QPQGEWkK7QFw= knative.dev/hack v0.0.0-20260318014029-7eede7fdcbad/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= knative.dev/pkg v0.0.0-20260406140200-cb58ae50e894 h1:Zabll+2HVz/YH9JLIIL/o7FH8tQP7m2neAgUNSJUjGk= diff --git a/vendor/knative.dev/eventing/pkg/apis/sources/v1/sinkbinding_lifecycle.go b/vendor/knative.dev/eventing/pkg/apis/sources/v1/sinkbinding_lifecycle.go index b369d91a8..746e7ddcd 100644 --- a/vendor/knative.dev/eventing/pkg/apis/sources/v1/sinkbinding_lifecycle.go +++ b/vendor/knative.dev/eventing/pkg/apis/sources/v1/sinkbinding_lifecycle.go @@ -23,7 +23,6 @@ import ( "strings" "go.uber.org/zap" - "k8s.io/client-go/kubernetes" corev1listers "k8s.io/client-go/listers/core/v1" corev1 "k8s.io/api/core/v1" @@ -215,30 +214,13 @@ func (sb *SinkBinding) Do(ctx context.Context, ps *duckv1.WithPod) { Value: ceOverrides, }) } - gvk := schema.GroupVersionKind{ - Group: SchemeGroupVersion.Group, - Version: SchemeGroupVersion.Version, - Kind: "SinkBinding", - } - bundles, err := eventingtls.PropagateTrustBundles(ctx, getKubeClient(ctx), GetTrustBundleConfigMapLister(ctx), gvk, sb) + + pss, err := eventingtls.AddTrustBundleVolumes(GetTrustBundleConfigMapLister(ctx), sb, &ps.Spec.Template.Spec) if err != nil { - logging.FromContext(ctx).Errorw("Failed to propagate trust bundles", zap.Error(err)) - } - if len(bundles) > 0 { - pss, err := eventingtls.AddTrustBundleVolumesFromConfigMaps(bundles, &ps.Spec.Template.Spec) - if err != nil { - logging.FromContext(ctx).Errorw("Failed to add trust bundle volumes from configmaps %s/%s: %+v", zap.Error(err)) - return - } - ps.Spec.Template.Spec = *pss - } else { - pss, err := eventingtls.AddTrustBundleVolumes(GetTrustBundleConfigMapLister(ctx), sb, &ps.Spec.Template.Spec) - if err != nil { - logging.FromContext(ctx).Errorw("Failed to add trust bundle volumes %s/%s: %+v", zap.Error(err)) - return - } - ps.Spec.Template.Spec = *pss + logging.FromContext(ctx).Errorw("Failed to add trust bundle volumes %s/%s: %+v", zap.Error(err)) + return } + ps.Spec.Template.Spec = *pss if sb.Status.OIDCTokenSecretName != nil { ps.Spec.Template.Spec.Volumes = append(ps.Spec.Template.Spec.Volumes, corev1.Volume{ @@ -348,20 +330,6 @@ func (sb *SinkBinding) Undo(ctx context.Context, ps *duckv1.WithPod) { } } -type kubeClientKey struct{} - -func WithKubeClient(ctx context.Context, k kubernetes.Interface) context.Context { - return context.WithValue(ctx, kubeClientKey{}, k) -} - -func getKubeClient(ctx context.Context) kubernetes.Interface { - k := ctx.Value(kubeClientKey{}) - if k == nil { - panic("No Kube client found in context.") - } - return k.(kubernetes.Interface) -} - type configMapListerKey struct{} func WithTrustBundleConfigMapLister(ctx context.Context, lister corev1listers.ConfigMapLister) context.Context { diff --git a/vendor/modules.txt b/vendor/modules.txt index 1b9ad7caf..d611bd61a 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1096,7 +1096,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/eventing v0.48.1-0.20260402142557-263a3a52c638 +# knative.dev/eventing v0.48.1-0.20260409081128-a29cbfbe8787 ## explicit; go 1.25.0 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent