Skip to content

Commit a5c3ab8

Browse files
committed
chore: update dependencies and remove version pinning
The prometheus/common v1.20.99 version was retracted (accidentally pushed tags). Downgraded to v0.67.5. The go.mod had a stale k8s.io/client-go v1.5.2 reference from the old versioning scheme (2016-2017 era), with replace directives overriding to v0.33.5. Updated to v0.34.2 and removed the replace directives. The prometheus test fix updates expected label format - the OTel Prometheus exporter uses underscore escaping by default for resource attributes (service.name → service_name). Changes: - Remove version pinning replace directives from go.mod - Downgrade prometheus/common from retracted v1.20.99 to v0.67.5 - Update k8s.io packages to v0.34.2 - Update OpenTelemetry packages to v1.39.0 - Replace golang.org/x/exp/maps with stdlib maps/slices packages - Fix prometheus test expected label format Signed-off-by: Vincent Link <[email protected]>
1 parent 8408d33 commit a5c3ab8

File tree

5 files changed

+178
-198
lines changed

5 files changed

+178
-198
lines changed

config/crd/bases/http.keda.sh_httpscaledobjects.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.17.3
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: httpscaledobjects.http.keda.sh
88
spec:
99
group: http.keda.sh

go.mod

Lines changed: 55 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -2,72 +2,54 @@ module github.com/kedacore/http-add-on
22

33
go 1.25.5
44

5-
replace (
6-
// pin k8s.io to v0.33.5 & sigs.k8s.io/controller-runtime to v0.21.0
7-
github.com/google/cel-go => github.com/google/cel-go v0.22.0
8-
github.com/prometheus/client_golang => github.com/prometheus/client_golang v1.23.0
9-
github.com/prometheus/client_model => github.com/prometheus/client_model v0.6.2
10-
github.com/prometheus/common => github.com/prometheus/common v0.62.0
11-
k8s.io/api => k8s.io/api v0.33.5
12-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.33.5
13-
k8s.io/apimachinery => k8s.io/apimachinery v0.33.5
14-
k8s.io/apiserver => k8s.io/apiserver v0.33.5
15-
k8s.io/client-go => k8s.io/client-go v0.33.5
16-
k8s.io/code-generator => k8s.io/code-generator v0.33.5
17-
k8s.io/component-base => k8s.io/component-base v0.33.5
18-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e
19-
k8s.io/metrics => k8s.io/metrics v0.33.5
20-
sigs.k8s.io/controller-runtime => sigs.k8s.io/controller-runtime v0.21.0
21-
sigs.k8s.io/gateway-api => sigs.k8s.io/gateway-api v1.3.0
22-
)
23-
245
require (
256
github.com/go-logr/logr v1.4.3
267
github.com/google/go-cmp v0.7.0
278
github.com/hashicorp/go-immutable-radix/v2 v2.1.0
289
github.com/kedacore/keda/v2 v2.18.3
2910
github.com/kelseyhightower/envconfig v1.4.0
30-
github.com/onsi/ginkgo/v2 v2.27.2
31-
github.com/onsi/gomega v1.38.2
11+
github.com/onsi/ginkgo/v2 v2.27.5
12+
github.com/onsi/gomega v1.39.0
3213
github.com/prometheus/client_golang v1.23.2
3314
github.com/prometheus/client_model v0.6.2
34-
github.com/prometheus/common v1.20.99
15+
github.com/prometheus/common v0.67.5
3516
github.com/stretchr/testify v1.11.1
36-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
37-
go.opentelemetry.io/contrib/propagators/b3 v1.38.0
38-
go.opentelemetry.io/otel v1.38.0
39-
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.38.0
40-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0
41-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.38.0
42-
go.opentelemetry.io/otel/exporters/prometheus v0.60.0
43-
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.38.0
44-
go.opentelemetry.io/otel/metric v1.38.0
45-
go.opentelemetry.io/otel/sdk v1.38.0
46-
go.opentelemetry.io/otel/sdk/metric v1.38.0
47-
go.opentelemetry.io/otel/trace v1.38.0
17+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.64.0
18+
go.opentelemetry.io/contrib/propagators/b3 v1.39.0
19+
go.opentelemetry.io/otel v1.39.0
20+
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetrichttp v1.39.0
21+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.39.0
22+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.39.0
23+
go.opentelemetry.io/otel/exporters/prometheus v0.61.0
24+
go.opentelemetry.io/otel/exporters/stdout/stdouttrace v1.39.0
25+
go.opentelemetry.io/otel/metric v1.39.0
26+
go.opentelemetry.io/otel/sdk v1.39.0
27+
go.opentelemetry.io/otel/sdk/metric v1.39.0
28+
go.opentelemetry.io/otel/trace v1.39.0
4829
go.uber.org/mock v0.6.0
49-
golang.org/x/sync v0.18.0
50-
google.golang.org/grpc v1.77.0-dev
51-
google.golang.org/protobuf v1.36.10
52-
k8s.io/api v0.34.1
53-
k8s.io/apimachinery v0.34.1
54-
k8s.io/client-go v1.5.2
55-
k8s.io/code-generator v0.34.1
56-
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
30+
golang.org/x/sync v0.19.0
31+
google.golang.org/grpc v1.78.0
32+
google.golang.org/protobuf v1.36.11
33+
k8s.io/api v0.34.3
34+
k8s.io/apimachinery v0.34.3
35+
k8s.io/client-go v0.34.3
36+
k8s.io/code-generator v0.34.3
37+
k8s.io/utils v0.0.0-20260108192941-914a6e750570
5738
sigs.k8s.io/controller-runtime v0.22.1
58-
sigs.k8s.io/controller-tools v0.17.3
59-
sigs.k8s.io/gateway-api v1.4.0
39+
sigs.k8s.io/controller-tools v0.19.0
40+
sigs.k8s.io/gateway-api v1.4.1
6041
sigs.k8s.io/kustomize/kustomize/v5 v5.8.0
6142
)
6243

6344
require (
6445
cel.dev/expr v0.24.0 // indirect
6546
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
66-
github.com/google/cel-go v0.26.0 // indirect
47+
github.com/google/cel-go v0.26.1 // indirect
6748
github.com/stoewer/go-strcase v1.3.1 // indirect
68-
k8s.io/apiserver v0.33.5 // indirect
69-
k8s.io/component-base v0.33.5 // indirect
70-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
49+
k8s.io/apiserver v0.34.3 // indirect
50+
k8s.io/component-base v0.34.3 // indirect
51+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.4 // indirect
52+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
7153
)
7254

7355
require (
@@ -87,25 +69,25 @@ require (
8769
github.com/go-errors/errors v1.5.1 // indirect
8870
github.com/go-logr/stdr v1.2.2 // indirect
8971
github.com/go-logr/zapr v1.3.0 // indirect
90-
github.com/go-openapi/jsonpointer v0.21.2 // indirect
91-
github.com/go-openapi/jsonreference v0.21.0 // indirect
72+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
73+
github.com/go-openapi/jsonreference v0.21.4 // indirect
9274
github.com/go-openapi/swag v0.23.1 // indirect
75+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
9376
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
9477
github.com/gobuffalo/flect v1.0.3 // indirect
9578
github.com/gogo/protobuf v1.3.2 // indirect
9679
github.com/google/btree v1.1.3 // indirect
97-
github.com/google/gnostic-models v0.7.0 // indirect
80+
github.com/google/gnostic-models v0.7.1 // indirect
9881
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
9982
github.com/google/uuid v1.6.0 // indirect
10083
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
101-
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
102-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
84+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.5 // indirect
10385
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
10486
github.com/inconshreveable/mousetrap v1.1.0 // indirect
10587
github.com/josharian/intern v1.0.0 // indirect
10688
github.com/json-iterator/go v1.1.12 // indirect
10789
github.com/kylelemons/godebug v1.1.0 // indirect
108-
github.com/mailru/easyjson v0.9.0 // indirect
90+
github.com/mailru/easyjson v0.9.1 // indirect
10991
github.com/mattn/go-colorable v0.1.14 // indirect
11092
github.com/mattn/go-isatty v0.0.20 // indirect
11193
github.com/moby/spdystream v0.5.0 // indirect
@@ -115,47 +97,45 @@ require (
11597
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
11698
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
11799
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
118-
github.com/prometheus/otlptranslator v0.0.2 // indirect
119-
github.com/prometheus/procfs v0.17.0 // indirect
100+
github.com/prometheus/otlptranslator v1.0.0 // indirect
101+
github.com/prometheus/procfs v0.19.2 // indirect
120102
github.com/sergi/go-diff v1.4.0 // indirect
121-
github.com/spf13/cobra v1.9.1 // indirect
103+
github.com/spf13/cobra v1.10.2 // indirect
122104
github.com/spf13/pflag v1.0.10 // indirect
123105
github.com/x448/float16 v0.8.4 // indirect
124106
github.com/xlab/treeprint v1.2.0 // indirect
125-
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
126-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
127-
go.opentelemetry.io/proto/otlp v1.7.1 // indirect
107+
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.39.0 // indirect
109+
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
128110
go.uber.org/multierr v1.11.0 // indirect
129111
go.uber.org/zap v1.27.1 // indirect
130112
go.yaml.in/yaml/v2 v2.4.3 // indirect
131113
go.yaml.in/yaml/v3 v3.0.4 // indirect
132-
golang.org/x/exp v0.0.0-20250531010427-b6e5de432a8b
133-
golang.org/x/mod v0.30.0 // indirect
134-
golang.org/x/net v0.47.0 // indirect
135-
golang.org/x/oauth2 v0.33.0 // indirect
136-
golang.org/x/sys v0.38.0 // indirect
137-
golang.org/x/term v0.37.0 // indirect
138-
golang.org/x/text v0.31.0 // indirect
114+
golang.org/x/exp v0.0.0-20260112195511-716be5621a96 // indirect
115+
golang.org/x/mod v0.32.0 // indirect
116+
golang.org/x/net v0.49.0 // indirect
117+
golang.org/x/oauth2 v0.34.0 // indirect
118+
golang.org/x/sys v0.40.0 // indirect
119+
golang.org/x/term v0.39.0 // indirect
120+
golang.org/x/text v0.33.0 // indirect
139121
golang.org/x/time v0.14.0 // indirect
140-
golang.org/x/tools v0.39.0 // indirect
141-
golang.org/x/tools/go/expect v0.1.1-deprecated // indirect
122+
golang.org/x/tools v0.41.0 // indirect
142123
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
143-
google.golang.org/genproto/googleapis/api v0.0.0-20251111163417-95abcf5c77ba // indirect
144-
google.golang.org/genproto/googleapis/rpc v0.0.0-20251124214823-79d6a2a48846 // indirect
124+
google.golang.org/genproto/googleapis/api v0.0.0-20260122232226-8e98ce8d340d // indirect
125+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260122232226-8e98ce8d340d // indirect
145126
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
146127
gopkg.in/inf.v0 v0.9.1 // indirect
147128
gopkg.in/yaml.v2 v2.4.0 // indirect
148129
gopkg.in/yaml.v3 v3.0.1 // indirect
149-
k8s.io/apiextensions-apiserver v0.34.2 // indirect
150-
k8s.io/gengo/v2 v2.0.0-20250820003526-c297c0c1eb9d // indirect
130+
k8s.io/apiextensions-apiserver v0.34.3 // indirect
131+
k8s.io/gengo/v2 v2.0.0-20251215205346-5ee0d033ba5b // indirect
151132
k8s.io/klog/v2 v2.130.1 // indirect
152-
k8s.io/kube-openapi v0.0.0-20250814151709-d7b6acb124c3 // indirect
133+
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
153134
knative.dev/pkg v0.0.0-20250602175424-3c3a920206ea // indirect
154135
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
155136
sigs.k8s.io/kustomize/api v0.21.0 // indirect
156137
sigs.k8s.io/kustomize/cmd/config v0.21.0 // indirect
157138
sigs.k8s.io/kustomize/kyaml v0.21.0 // indirect
158139
sigs.k8s.io/randfill v1.0.0 // indirect
159-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
160140
sigs.k8s.io/yaml v1.6.0 // indirect
161141
)

0 commit comments

Comments
 (0)