Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ require (
k8s.io/api v0.33.4
k8s.io/apimachinery v0.33.4
k8s.io/client-go v0.33.4
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/serving v0.46.1-0.20250818121446-1f2f77ed6a9b
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a
)

require (
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -387,16 +387,16 @@ 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/networking v0.0.0-20250814015442-a7d77604fab6 h1:fAtX+2BMMGUR2qajytXxGaOlUqjNghhUzM5Eis4zkZE=
knative.dev/networking v0.0.0-20250814015442-a7d77604fab6/go.mod h1:G72DDanqC/d33qcl4V6TkR7i56zrlIYhErdToVTJ/BE=
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e h1:MQvV6He65+DIYxcHWahAij/JSwNUs78JqmONjMZQhtU=
knative.dev/pkg v0.0.0-20250817140644-c745f1fcaa2e/go.mod h1:D3Q1EurZkGaiPNEvPpErGmUU7Ny0WgqGVktfIyH2vYM=
knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b h1:SZFzv72D0ZpSkQ2VkSPxljqlOV63BVwA29DKNyJPoog=
knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM=
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a h1:eeiDiB+EzpN2Q8QsNEAKkdfWzWNTtwkkwOFpqqWWL/g=
knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a/go.mod h1:BiPDjH+2WedExrayB4IT1qTQJQ92qzussfhSY/R2gLM=
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-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
Expand Down
14 changes: 14 additions & 0 deletions vendor/knative.dev/eventing/pkg/observability/config.go
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
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,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/adapter/v2
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
Expand Down Expand Up @@ -1237,7 +1237,7 @@ knative.dev/pkg/tracker
knative.dev/pkg/version
knative.dev/pkg/webhook
knative.dev/pkg/webhook/certificates/resources
# knative.dev/serving v0.46.1-0.20250818121446-1f2f77ed6a9b
# knative.dev/serving v0.46.1-0.20250818182249-23f988f3671a
## explicit; go 1.24.0
knative.dev/serving/pkg/apis/autoscaling
knative.dev/serving/pkg/apis/autoscaling/v1alpha1
Expand Down
Loading