diff --git a/go.mod b/go.mod index 8fa49204..f8ba8706 100644 --- a/go.mod +++ b/go.mod @@ -13,10 +13,10 @@ require ( k8s.io/api v0.35.3 k8s.io/apimachinery v0.35.3 k8s.io/client-go v0.35.3 - knative.dev/client/pkg v0.0.0-20260406143302-75dbeb4ac2bc + knative.dev/client/pkg v0.0.0-20260409143329-bd5c942fa72a knative.dev/hack v0.0.0-20260318014029-7eede7fdcbad knative.dev/networking v0.0.0-20260407015926-cc2f0572b3c2 - knative.dev/serving v0.48.1-0.20260406161726-28ed823c890a + knative.dev/serving v0.48.1-0.20260409123928-fb0fe75fb2b0 ) require ( @@ -104,7 +104,7 @@ require ( k8s.io/klog/v2 v2.130.1 // indirect k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 // indirect - knative.dev/eventing v0.48.1-0.20260402142557-263a3a52c638 // indirect + knative.dev/eventing v0.48.1-0.20260409081128-a29cbfbe8787 // indirect knative.dev/pkg v0.0.0-20260406140200-cb58ae50e894 // indirect sigs.k8s.io/gateway-api v1.1.0 // indirect sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect diff --git a/go.sum b/go.sum index d3981873..9567442c 100644 --- a/go.sum +++ b/go.sum @@ -303,18 +303,18 @@ 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/client/pkg v0.0.0-20260406143302-75dbeb4ac2bc h1:eHQggpYRGXnAIcyIpTzrRcdB2zAFBEENm0CxWBoTCF0= -knative.dev/client/pkg v0.0.0-20260406143302-75dbeb4ac2bc/go.mod h1:JoYIBBqMmH0k/nmdXnRG15fGpk6gUG1HsxeIY3SJM8M= -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/client/pkg v0.0.0-20260409143329-bd5c942fa72a h1:+KoR+MbCzEUnE4VF82q6MMc3UIhlIveitlQ7xG8gT+8= +knative.dev/client/pkg v0.0.0-20260409143329-bd5c942fa72a/go.mod h1:FA1cBUP3PRdUraWvL3tqJWd/V2UvPxjZgFx7LTOi0MM= +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/networking v0.0.0-20260407015926-cc2f0572b3c2 h1:8QlbccV/8/YO2zIoCAOvjU/0t5HxMiWyo480cwohrlQ= knative.dev/networking v0.0.0-20260407015926-cc2f0572b3c2/go.mod h1:a3XBEpYEpWTSz6DdKNXA6+hcny6SSs5J9FChfPxUJMM= knative.dev/pkg v0.0.0-20260406140200-cb58ae50e894 h1:Zabll+2HVz/YH9JLIIL/o7FH8tQP7m2neAgUNSJUjGk= knative.dev/pkg v0.0.0-20260406140200-cb58ae50e894/go.mod h1:pqHAkUWsa/DsOKJvubQ7JjesfbA+W7ph3nOXt7DCiAw= -knative.dev/serving v0.48.1-0.20260406161726-28ed823c890a h1:cCxq1r3Q0/tz4d1ZJVlsoo6x8UIItly2pzRxnCqbeM0= -knative.dev/serving v0.48.1-0.20260406161726-28ed823c890a/go.mod h1:7XF9eO/WFRFuDh7GJ4Xl8vxFWWDWM8b+Y/3O6ymv7pQ= +knative.dev/serving v0.48.1-0.20260409123928-fb0fe75fb2b0 h1:6umsX75zGB9CrGBjePc0LudKZNmC2/dHoqh82u0xdMw= +knative.dev/serving v0.48.1-0.20260409123928-fb0fe75fb2b0/go.mod h1:PgaZ8QYeQK1eJYWQa1+R+0C5KH2abJerH66lMnuUHkU= sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM= sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs= sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg= 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 b369d91a..746e7ddc 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 2d19e5f9..bbda94fb 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -926,7 +926,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/client/pkg v0.0.0-20260406143302-75dbeb4ac2bc +# knative.dev/client/pkg v0.0.0-20260409143329-bd5c942fa72a ## explicit; go 1.25.0 knative.dev/client/pkg/apis/client knative.dev/client/pkg/apis/client/v1alpha1 @@ -953,7 +953,7 @@ knative.dev/client/pkg/util/errors knative.dev/client/pkg/util/mock knative.dev/client/pkg/util/test knative.dev/client/pkg/wait -# 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/apis/common/integration/v1alpha1 knative.dev/eventing/pkg/apis/config @@ -1045,7 +1045,7 @@ knative.dev/pkg/test/ingress knative.dev/pkg/test/logging knative.dev/pkg/test/spoof knative.dev/pkg/tracker -# knative.dev/serving v0.48.1-0.20260406161726-28ed823c890a +# knative.dev/serving v0.48.1-0.20260409123928-fb0fe75fb2b0 ## explicit; go 1.25.0 knative.dev/serving/pkg/apis/autoscaling knative.dev/serving/pkg/apis/autoscaling/v1alpha1