From a22ea3de971591015760e3ad0cdf5915acfafb2f Mon Sep 17 00:00:00 2001 From: Knative Automation Date: Wed, 22 Apr 2026 01:56:00 +0000 Subject: [PATCH] upgrade to latest dependencies bumping knative.dev/eventing c76e74e...4c2bc60: > 4c2bc60 ci: upgrade actions/checkout from v2 to v6 in knative-downstream workflow (# 8988) > d5f437f Update default minimum TLS version to 1.3 (# 8916) > 64e15c4 hack: remove redundant exit-code check after go run in install.sh (# 9002) > 32bc524 hack: replace fragile awk pipeline with 'go env GOARCH' in install.sh (# 9000) > b3edbad [main] Upgrade to latest dependencies (# 9031) > 00316e4 Move GetLoggingConfig from cmd/broker to pkg/utils (# 9015) > 21c9b35 Wait in adapter for goroutines before returning in startFailFast (# 9030) bumping knative.dev/hack 504af4d...aeb7b4a: > aeb7b4a Remove deprecated go get -d flag (# 473) bumping knative.dev/pkg 3cd6d60...ec45287: > ec45287 upgrade to latest dependencies (# 3348) Signed-off-by: Knative Automation --- go.mod | 6 +-- go.sum | 12 +++--- .../eventing/pkg/eventingtls/eventingtls.go | 10 +---- .../knative.dev/eventing/pkg/utils/logging.go | 40 +++++++++++++++++++ vendor/knative.dev/hack/library.sh | 2 +- vendor/modules.txt | 6 +-- 6 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 vendor/knative.dev/eventing/pkg/utils/logging.go diff --git a/go.mod b/go.mod index 7bf334251..5fd097046 100644 --- a/go.mod +++ b/go.mod @@ -12,9 +12,9 @@ require ( k8s.io/api v0.35.4 k8s.io/apimachinery v0.35.4 k8s.io/client-go v0.35.4 - knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85 - knative.dev/hack v0.0.0-20260416140237-504af4d2178f - knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 + knative.dev/eventing v0.48.1-0.20260421222011-4c2bc608123c + knative.dev/hack v0.0.0-20260421155212-aeb7b4a9bf96 + knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1 ) require ( diff --git a/go.sum b/go.sum index 1ed8c27b3..50ab282fc 100644 --- a/go.sum +++ b/go.sum @@ -348,12 +348,12 @@ 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.20260420100227-c76e74eeff85 h1:cIbAhw6JuoljtfWHaGR7LadmdZFaARe3JUvvIqAXsmU= -knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85/go.mod h1:LHawjeS2AS4KfEb91YyY0wzyPmGu8fUjJU3wP7ANQ1E= -knative.dev/hack v0.0.0-20260416140237-504af4d2178f h1:YTht2cGdhd++kSrhwcDutWpk1V1bi0vKpAs0h4xIjpw= -knative.dev/hack v0.0.0-20260416140237-504af4d2178f/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= -knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 h1:rTbIPgPE5j8ptHoDXBoiabWJCQeC1F1lPFtlN/wrQek= -knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35/go.mod h1:VtAr0jJJtx6qqoVx5eNd8YEnnsfyBE/GXPsTmp4nrtM= +knative.dev/eventing v0.48.1-0.20260421222011-4c2bc608123c h1:R3Iz1j7UeSoCgRU8zevj21Xp+pv7ESf1+5KnGdntljE= +knative.dev/eventing v0.48.1-0.20260421222011-4c2bc608123c/go.mod h1:3b/Bc2WjGEvOgEyRokjYTJrzYZQADeCkpr79GIDo+xE= +knative.dev/hack v0.0.0-20260421155212-aeb7b4a9bf96 h1:YrpWTCDRzoGz0Fe7AcLTsBY+D5vx0ijhuxEVl0z3Xyw= +knative.dev/hack v0.0.0-20260421155212-aeb7b4a9bf96/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0= +knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1 h1:bO5X2bugzMqoVltm2n16mHpAdpSR0HRWeAKzHUL2Cgk= +knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1/go.mod h1:EZeB2nBW4QcpZuCPB5a/UnoVIH2N+5z5fwNw1PUeqMg= 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/eventingtls/eventingtls.go b/vendor/knative.dev/eventing/pkg/eventingtls/eventingtls.go index 93ed18152..bb7006372 100644 --- a/vendor/knative.dev/eventing/pkg/eventingtls/eventingtls.go +++ b/vendor/knative.dev/eventing/pkg/eventingtls/eventingtls.go @@ -47,8 +47,6 @@ const ( TLSKey = "tls.key" // TLSCrt is the key in the TLS secret for the public key of TLS servers TLSCrt = "tls.crt" - // DefaultMinTLSVersion is the default minimum TLS version for servers and clients. - DefaultMinTLSVersion = tls.VersionTLS12 // SecretCACrt is the name of the CA Cert in the secret SecretCACert = "ca.crt" // IMCDispatcherServerTLSSecretName is the name of the tls secret for the imc dispatcher server @@ -198,19 +196,13 @@ func GetTLSServerConfig(config ServerConfig) (*tls.Config, error) { // defaultTLSConfigFromEnv loads TLS configuration from environment variables // using the shared knative/pkg/tls utility. DefaultConfigFromEnv defaults to -// TLS 1.3, but eventing historically defaults to TLS 1.2, so we fall back to -// 1.2 unless TLS_MIN_VERSION is explicitly set. -// TODO: switch to TLS 1.3 to align with the rest of the system. +// TLS 1.3. func defaultTLSConfigFromEnv() (*tls.Config, error) { cfg, err := pkgtls.DefaultConfigFromEnv("") if err != nil { return nil, fmt.Errorf("failed to load TLS config from env: %w", err) } - if os.Getenv(pkgtls.MinVersionEnvKey) == "" { - cfg.MinVersion = DefaultMinTLSVersion - } - return cfg, nil } diff --git a/vendor/knative.dev/eventing/pkg/utils/logging.go b/vendor/knative.dev/eventing/pkg/utils/logging.go new file mode 100644 index 000000000..06b8f8e9a --- /dev/null +++ b/vendor/knative.dev/eventing/pkg/utils/logging.go @@ -0,0 +1,40 @@ +/* +Copyright 2019 The Knative Authors + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package utils + +import ( + "context" + + apierrors "k8s.io/apimachinery/pkg/api/errors" + metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" + + kubeclient "knative.dev/pkg/client/injection/kube/client" + "knative.dev/pkg/logging" +) + +// GetLoggingConfig fetches the logging ConfigMap from the given namespace and +// parses it into a *logging.Config. If the ConfigMap is not found, it returns +// the default logging config. +func GetLoggingConfig(ctx context.Context, namespace, loggingConfigMapName string) (*logging.Config, error) { + loggingConfigMap, err := kubeclient.Get(ctx).CoreV1().ConfigMaps(namespace).Get(ctx, loggingConfigMapName, metav1.GetOptions{}) + if apierrors.IsNotFound(err) { + return logging.NewConfigFromMap(nil) + } else if err != nil { + return nil, err + } + return logging.NewConfigFromConfigMap(loggingConfigMap) +} diff --git a/vendor/knative.dev/hack/library.sh b/vendor/knative.dev/hack/library.sh index d5bcacab0..d41d8e018 100644 --- a/vendor/knative.dev/hack/library.sh +++ b/vendor/knative.dev/hack/library.sh @@ -838,7 +838,7 @@ function __go_update_deps_for_module() { FLOATING_DEPS+=( $(go_run knative.dev/toolbox/buoy@latest float ./go.mod "${buoyArgs[@]}") ) if [[ ${#FLOATING_DEPS[@]} > 0 ]]; then echo "Floating deps to ${FLOATING_DEPS[@]}" - go get -d ${FLOATING_DEPS[@]} + go get ${FLOATING_DEPS[@]} else echo "Nothing to upgrade." fi diff --git a/vendor/modules.txt b/vendor/modules.txt index b47dcb012..79cca9ae3 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1095,7 +1095,7 @@ k8s.io/utils/net k8s.io/utils/pointer k8s.io/utils/ptr k8s.io/utils/trace -# knative.dev/eventing v0.48.1-0.20260420100227-c76e74eeff85 +# knative.dev/eventing v0.48.1-0.20260421222011-4c2bc608123c ## explicit; go 1.25.0 knative.dev/eventing/pkg/adapter/v2 knative.dev/eventing/pkg/adapter/v2/util/crstatusevent @@ -1126,10 +1126,10 @@ knative.dev/eventing/pkg/observability/configmap knative.dev/eventing/pkg/observability/otel knative.dev/eventing/pkg/reconciler/source knative.dev/eventing/pkg/utils -# knative.dev/hack v0.0.0-20260416140237-504af4d2178f +# knative.dev/hack v0.0.0-20260421155212-aeb7b4a9bf96 ## explicit; go 1.24 knative.dev/hack -# knative.dev/pkg v0.0.0-20260420135127-3cd6d6017a35 +# knative.dev/pkg v0.0.0-20260422015212-ec452872dcc1 ## explicit; go 1.25.0 knative.dev/pkg/apis knative.dev/pkg/apis/duck