Skip to content

[main] Upgrade to latest dependencies #672

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
Aug 19, 2025
Merged

[main] Upgrade to latest dependencies #672

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 @@ -29,7 +29,7 @@ require (
k8s.io/client-go v0.33.4
k8s.io/code-generator v0.33.4
k8s.io/utils v0.0.0-20241210054802-24370beab758
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e
knative.dev/reconciler-test v0.0.0-20250818021647-3bf376b1f1ce
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 @@ -1070,8 +1070,8 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04 h1:3IiyVZfZsSNltuR6OzuA1QRVS8efE+juGHPD89q4Thg=
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg=
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e h1:cpJitv7xBjLVxPrNNrEtoRuvKQQOKABfxO9sLEyoFDc=
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg=
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba h1:PkOTBI8DRfvUKD8HTvYYT94NJ49J++llrDo3y0/ZAwc=
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e h1:MQvV6He65+DIYxcHWahAij/JSwNUs78JqmONjMZQhtU=
Expand Down
14 changes: 14 additions & 0 deletions vendor/knative.dev/eventing/pkg/observability/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ import (

configmap "knative.dev/pkg/configmap/parser"
pkgo11y "knative.dev/pkg/observability"
"knative.dev/pkg/observability/metrics"
)

const (
Expand All @@ -30,6 +31,9 @@ const (

// DefaultEnableSinkEventErrorReporting is used to set the default sink event error reporting value
DefaultEnableSinkEventErrorReporting = false

// DefaultMetricsPort is the default port used for prometheus metrics if the prometheus protocol is used
DefaultMetricsPort = 9092
)

type (
Expand Down Expand Up @@ -65,6 +69,11 @@ func NewFromMap(m map[string]string) (*Config, error) {
c.BaseConfig = *cfg
}

// Force the port to the default queue user metrics port if it's not overridden
if c.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && c.BaseConfig.Metrics.Endpoint == "" {
c.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort)
}

err := configmap.Parse(m, configmap.As(EnableSinkEventErrorReportingKey, &c.EnableSinkEventErrorReporting))
if err != nil {
fmt.Printf("failed to parse enable-sink-error-reporting: %s\n", err.Error())
Expand Down Expand Up @@ -99,6 +108,11 @@ func MergeWithDefaults(cfg *Config) *Config {
cfg.Metrics = d.Metrics
}

// Force the port to the default queue user metrics port if it's not overridden
if cfg.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && cfg.BaseConfig.Metrics.Endpoint == "" {
cfg.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort)
}

var emptyRuntime RuntimeConfig
if cfg.Runtime == emptyRuntime {
cfg.Runtime = d.Runtime
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 @@ -1174,7 +1174,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/trace
# knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04
# knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e
## explicit; go 1.24.0
knative.dev/eventing/pkg/apis
knative.dev/eventing/pkg/apis/common/integration/v1alpha1
Expand Down
Loading