Skip to content

Commit 6f6988a

Browse files
upgrade to latest dependencies (#611)
bumping knative.dev/serving 5765200...4299272: > 4299272 upgrade to latest dependencies (# 16025) > ace7258 [release-1.19] Fix queue proxy user metrics port (# 16021) > b828280 fix a tracing protocol comment (# 16016) bumping knative.dev/eventing 7ea8857...02445c1: > 02445c1 [release-1.19] Upgrade to latest dependencies (# 8671) > c1ca4fa [release-1.19] fix: metrics with prometheus default to same port as before (# 8670) > 8a4f284 [release-1.19] remove prometheus from tracing protocol [skip-dot-release] (# 8666) > 5b2ee4a [release-1.19] adjust test to allow operator upgrade [skip-dot-release] (# 8663) > 6aadceb [release-1.19] Injected tracing headers into jobsink event file (# 8657) Signed-off-by: Knative Automation <[email protected]>
1 parent ee7e265 commit 6f6988a

File tree

4 files changed

+22
-8
lines changed

4 files changed

+22
-8
lines changed

go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ require (
1515
k8s.io/apimachinery v0.33.1
1616
k8s.io/client-go v0.33.1
1717
k8s.io/code-generator v0.33.1
18-
knative.dev/eventing v0.46.0
18+
knative.dev/eventing v0.46.1
1919
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba
2020
knative.dev/pkg v0.0.0-20250817152444-53ed1d53d232
21-
knative.dev/serving v0.46.0
21+
knative.dev/serving v0.46.1
2222
)
2323

2424
require (

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -366,16 +366,16 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
366366
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
367367
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
368368
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
369-
knative.dev/eventing v0.46.0 h1:DGkvUcZagkvvcRxf5jh/usdictP8BWa7kHgIocfT4MY=
370-
knative.dev/eventing v0.46.0/go.mod h1:w5YnKVzZBuXXTJb8QN3POXTgXhM07d0tihBZYoSNF+I=
369+
knative.dev/eventing v0.46.1 h1:c/Cxqa12MUIRtbJzvHyI8S5v04MZlEz7auidF5Q8OIY=
370+
knative.dev/eventing v0.46.1/go.mod h1:tBmI283bb0l9HWPOdog97ZOkoJgivqHTA/XFjpRgTYE=
371371
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba h1:PkOTBI8DRfvUKD8HTvYYT94NJ49J++llrDo3y0/ZAwc=
372372
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
373373
knative.dev/networking v0.0.0-20250716125000-edb1a4a0c863 h1:CYX6QidA9ab5KqvFiV+Dow8D94+kGelccOie9rmt/bA=
374374
knative.dev/networking v0.0.0-20250716125000-edb1a4a0c863/go.mod h1:nl+drvAW6onp4f+T7Ax83NgOCyyqCbWgfL8FxuCVgMw=
375375
knative.dev/pkg v0.0.0-20250817152444-53ed1d53d232 h1:DqXSNueFZ28EAoU4wrPu8nsFBNazJAfxFlOn/1qqqcQ=
376376
knative.dev/pkg v0.0.0-20250817152444-53ed1d53d232/go.mod h1:ZIbXYkQ/A4WeXhPyeZ9OtEuW4RTkpxeYNByJeC0h6Zs=
377-
knative.dev/serving v0.46.0 h1:OF4Jt+6xY4nw0lFb9G3rEEJPZcNx1k2Kf1IhhJp/Rg4=
378-
knative.dev/serving v0.46.0/go.mod h1:DlTwkSWEPku/Dn2nnnkDCaUnFtN/YqUr6Be+fq8ZUk4=
377+
knative.dev/serving v0.46.1 h1:nkbZMcu5r1c+hZhOSW3MIh/7mJp/WLQ4j89PHknDXyU=
378+
knative.dev/serving v0.46.1/go.mod h1:NHcCSU65kUFC8rmvxoa+v3HEqWsahTBWsobGvqp3Dd0=
379379
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
380380
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
381381
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=

vendor/knative.dev/eventing/pkg/observability/config.go

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ import (
2222

2323
configmap "knative.dev/pkg/configmap/parser"
2424
pkgo11y "knative.dev/pkg/observability"
25+
"knative.dev/pkg/observability/metrics"
2526
)
2627

2728
const (
@@ -30,6 +31,9 @@ const (
3031

3132
// DefaultEnableSinkEventErrorReporting is used to set the default sink event error reporting value
3233
DefaultEnableSinkEventErrorReporting = false
34+
35+
// DefaultMetricsPort is the default port used for prometheus metrics if the prometheus protocol is used
36+
DefaultMetricsPort = 9092
3337
)
3438

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

72+
// Force the port to the default queue user metrics port if it's not overridden
73+
if c.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && c.BaseConfig.Metrics.Endpoint == "" {
74+
c.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort)
75+
}
76+
6877
err := configmap.Parse(m, configmap.As(EnableSinkEventErrorReportingKey, &c.EnableSinkEventErrorReporting))
6978
if err != nil {
7079
fmt.Printf("failed to parse enable-sink-error-reporting: %s\n", err.Error())
@@ -99,6 +108,11 @@ func MergeWithDefaults(cfg *Config) *Config {
99108
cfg.Metrics = d.Metrics
100109
}
101110

111+
// Force the port to the default queue user metrics port if it's not overridden
112+
if cfg.BaseConfig.Metrics.Protocol == metrics.ProtocolPrometheus && cfg.BaseConfig.Metrics.Endpoint == "" {
113+
cfg.BaseConfig.Metrics.Endpoint = fmt.Sprintf(":%d", DefaultMetricsPort)
114+
}
115+
102116
var emptyRuntime RuntimeConfig
103117
if cfg.Runtime == emptyRuntime {
104118
cfg.Runtime = d.Runtime

vendor/modules.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,7 +1098,7 @@ k8s.io/utils/net
10981098
k8s.io/utils/pointer
10991099
k8s.io/utils/ptr
11001100
k8s.io/utils/trace
1101-
# knative.dev/eventing v0.46.0
1101+
# knative.dev/eventing v0.46.1
11021102
## explicit; go 1.24.0
11031103
knative.dev/eventing/pkg/adapter/v2
11041104
knative.dev/eventing/pkg/adapter/v2/test
@@ -1249,7 +1249,7 @@ knative.dev/pkg/webhook/psbinding
12491249
knative.dev/pkg/webhook/resourcesemantics
12501250
knative.dev/pkg/webhook/resourcesemantics/defaulting
12511251
knative.dev/pkg/webhook/resourcesemantics/validation
1252-
# knative.dev/serving v0.46.0
1252+
# knative.dev/serving v0.46.1
12531253
## explicit; go 1.24.0
12541254
knative.dev/serving/pkg/apis/autoscaling
12551255
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)