Skip to content

Commit 896ab3a

Browse files
upgrade to latest dependencies (#610)
bumping knative.dev/eventing 0a35d6e...b8caa63: > b8caa63 fix: metrics with prometheus default to same port as before (# 8669) bumping knative.dev/serving 1f2f77e...23f988f: > 23f988f Update net-contour nightly (# 16024) Signed-off-by: Knative Automation <[email protected]>
1 parent bfd4d3e commit 896ab3a

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.4
1616
k8s.io/client-go v0.33.4
1717
k8s.io/code-generator v0.33.4
18-
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04
18+
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e
1919
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba
2020
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e
21-
knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b
21+
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a
2222
)
2323

2424
require (

go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -374,16 +374,16 @@ k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff h1:/usPimJzUKKu+m+TE36gUy
374374
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff/go.mod h1:5jIi+8yX4RIb8wk3XwBo5Pq2ccx4FP10ohkbSKCZoK8=
375375
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
376376
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
377-
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04 h1:3IiyVZfZsSNltuR6OzuA1QRVS8efE+juGHPD89q4Thg=
378-
knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg=
377+
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e h1:cpJitv7xBjLVxPrNNrEtoRuvKQQOKABfxO9sLEyoFDc=
378+
knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e/go.mod h1:pA2CWkd3Pl4E0Y81ochzLtZbL8b23+BzpkYSgAUTNqg=
379379
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba h1:PkOTBI8DRfvUKD8HTvYYT94NJ49J++llrDo3y0/ZAwc=
380380
knative.dev/hack v0.0.0-20250708013849-70d4b00da6ba/go.mod h1:R0ritgYtjLDO9527h5vb5X6gfvt5LCrJ55BNbVDsWiY=
381381
knative.dev/networking v0.0.0-20250814015442-a7d77604fab6 h1:fAtX+2BMMGUR2qajytXxGaOlUqjNghhUzM5Eis4zkZE=
382382
knative.dev/networking v0.0.0-20250814015442-a7d77604fab6/go.mod h1:G72DDanqC/d33qcl4V6TkR7i56zrlIYhErdToVTJ/BE=
383383
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e h1:MQvV6He65+DIYxcHWahAij/JSwNUs78JqmONjMZQhtU=
384384
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e/go.mod h1:D3Q1EurZkGaiPNEvPpErGmUU7Ny0WgqGVktfIyH2vYM=
385-
knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b h1:SZFzv72D0ZpSkQ2VkSPxljqlOV63BVwA29DKNyJPoog=
386-
knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM=
385+
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a h1:eeiDiB+EzpN2Q8QsNEAKkdfWzWNTtwkkwOFpqqWWL/g=
386+
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM=
387387
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
388388
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
389389
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
@@ -1104,7 +1104,7 @@ k8s.io/utils/net
11041104
k8s.io/utils/pointer
11051105
k8s.io/utils/ptr
11061106
k8s.io/utils/trace
1107-
# knative.dev/eventing v0.46.1-0.20250818084647-0a35d6edaa04
1107+
# knative.dev/eventing v0.46.1-0.20250818152648-b8caa635621e
11081108
## explicit; go 1.24.0
11091109
knative.dev/eventing/pkg/adapter/v2
11101110
knative.dev/eventing/pkg/adapter/v2/test
@@ -1255,7 +1255,7 @@ knative.dev/pkg/webhook/psbinding
12551255
knative.dev/pkg/webhook/resourcesemantics
12561256
knative.dev/pkg/webhook/resourcesemantics/defaulting
12571257
knative.dev/pkg/webhook/resourcesemantics/validation
1258-
# knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b
1258+
# knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a
12591259
## explicit; go 1.24.0
12601260
knative.dev/serving/pkg/apis/autoscaling
12611261
knative.dev/serving/pkg/apis/autoscaling/v1alpha1

0 commit comments

Comments
 (0)