Skip to content

Commit 8e64f66

Browse files
renovate[bot]timebertt
renovate[bot]
and
timebertt
authored
Update k8s packages (minor) (#575)
* Update k8s packages * `go work use && make tidy` * Silence deprecation warning * Reapply "Drop obsolete go collector in favor of controller-runtime" (#499) This reverts commit 9f48634. Breaking back-and-forth in controller-runtime. This adapts to kubernetes-sigs/controller-runtime#3070 --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tim Ebert <[email protected]>
1 parent 3f81aa8 commit 8e64f66

File tree

9 files changed

+238
-239
lines changed

9 files changed

+238
-239
lines changed

‎cmd/sharder/app/app.go‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ import (
2121
"fmt"
2222

2323
"github.com/go-logr/logr"
24-
"github.com/prometheus/client_golang/prometheus/collectors"
2524
"github.com/spf13/cobra"
2625
"github.com/spf13/pflag"
2726
"go.uber.org/automaxprocs/maxprocs"
@@ -32,7 +31,6 @@ import (
3231
logf "sigs.k8s.io/controller-runtime/pkg/log"
3332
"sigs.k8s.io/controller-runtime/pkg/log/zap"
3433
"sigs.k8s.io/controller-runtime/pkg/manager"
35-
"sigs.k8s.io/controller-runtime/pkg/metrics"
3634

3735
"github.com/timebertt/kubernetes-controller-sharding/pkg/controller"
3836
healthzutils "github.com/timebertt/kubernetes-controller-sharding/pkg/utils/healthz"
@@ -92,10 +90,6 @@ func run(ctx context.Context, log logr.Logger, opts *options) error {
9290
log.Error(err, "Failed to set GOMAXPROCS")
9391
}
9492

95-
// replace deprecated legacy go collector
96-
metrics.Registry.Unregister(collectors.NewGoCollector())
97-
metrics.Registry.MustRegister(collectors.NewGoCollector(collectors.WithGoCollectorRuntimeMetrics(collectors.MetricsAll)))
98-
9993
log.Info("Setting up manager")
10094
mgr, err := manager.New(opts.restConfig, opts.managerOptions)
10195
if err != nil {

‎go.mod‎

Lines changed: 33 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/timebertt/kubernetes-controller-sharding
22

3-
go 1.23.0
3+
go 1.24.0
44

55
toolchain go1.24.4
66

@@ -18,20 +18,19 @@ require (
1818
go.uber.org/automaxprocs v1.6.0
1919
go.uber.org/zap v1.27.0
2020
gomodules.xyz/jsonpatch/v2 v2.5.0
21-
k8s.io/api v0.32.6
22-
k8s.io/apimachinery v0.32.6
23-
k8s.io/client-go v0.32.6
24-
k8s.io/code-generator v0.32.6
25-
k8s.io/component-base v0.32.6
21+
k8s.io/api v0.33.2
22+
k8s.io/apimachinery v0.33.2
23+
k8s.io/client-go v0.33.2
24+
k8s.io/code-generator v0.33.2
25+
k8s.io/component-base v0.33.2
2626
k8s.io/klog/v2 v2.130.1
2727
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
28-
sigs.k8s.io/controller-runtime v0.20.4
28+
sigs.k8s.io/controller-runtime v0.21.0
2929
)
3030

3131
require (
32-
cel.dev/expr v0.18.0 // indirect
32+
cel.dev/expr v0.19.1 // indirect
3333
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
34-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3534
github.com/beorn7/perks v1.0.1 // indirect
3635
github.com/blang/semver/v4 v4.0.0 // indirect
3736
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
@@ -48,14 +47,12 @@ require (
4847
github.com/go-openapi/swag v0.23.0 // indirect
4948
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5049
github.com/gogo/protobuf v1.3.2 // indirect
51-
github.com/golang/protobuf v1.5.4 // indirect
5250
github.com/google/btree v1.1.3 // indirect
53-
github.com/google/cel-go v0.22.0 // indirect
54-
github.com/google/gnostic-models v0.6.8 // indirect
51+
github.com/google/cel-go v0.23.2 // indirect
52+
github.com/google/gnostic-models v0.6.9 // indirect
5553
github.com/google/go-cmp v0.7.0 // indirect
56-
github.com/google/gofuzz v1.2.0 // indirect
5754
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
58-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
55+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
5956
github.com/hashicorp/errwrap v1.1.0 // indirect
6057
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6158
github.com/josharian/intern v1.0.0 // indirect
@@ -70,38 +67,40 @@ require (
7067
github.com/prometheus/procfs v0.15.1 // indirect
7168
github.com/stoewer/go-strcase v1.3.0 // indirect
7269
github.com/x448/float16 v0.8.4 // indirect
73-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
74-
go.opentelemetry.io/otel v1.28.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
76-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
77-
go.opentelemetry.io/otel/metric v1.28.0 // indirect
78-
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
79-
go.opentelemetry.io/otel/trace v1.28.0 // indirect
80-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
70+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
71+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.58.0 // indirect
72+
go.opentelemetry.io/otel v1.33.0 // indirect
73+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.33.0 // indirect
74+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.33.0 // indirect
75+
go.opentelemetry.io/otel/metric v1.33.0 // indirect
76+
go.opentelemetry.io/otel/sdk v1.33.0 // indirect
77+
go.opentelemetry.io/otel/trace v1.33.0 // indirect
78+
go.opentelemetry.io/proto/otlp v1.4.0 // indirect
8179
go.uber.org/multierr v1.11.0 // indirect
8280
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
8381
golang.org/x/mod v0.24.0 // indirect
84-
golang.org/x/net v0.37.0 // indirect
85-
golang.org/x/oauth2 v0.24.0 // indirect
82+
golang.org/x/net v0.38.0 // indirect
83+
golang.org/x/oauth2 v0.27.0 // indirect
8684
golang.org/x/sync v0.12.0 // indirect
8785
golang.org/x/sys v0.32.0 // indirect
8886
golang.org/x/term v0.30.0 // indirect
8987
golang.org/x/text v0.23.0 // indirect
90-
golang.org/x/time v0.7.0 // indirect
88+
golang.org/x/time v0.9.0 // indirect
9189
golang.org/x/tools v0.31.0 // indirect
92-
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
93-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240826202546-f6391c0de4c7 // indirect
94-
google.golang.org/grpc v1.65.0 // indirect
90+
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
91+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241209162323-e6fa225c2576 // indirect
92+
google.golang.org/grpc v1.68.1 // indirect
9593
google.golang.org/protobuf v1.36.5 // indirect
9694
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9795
gopkg.in/inf.v0 v0.9.1 // indirect
9896
gopkg.in/yaml.v3 v3.0.1 // indirect
99-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
100-
k8s.io/apiserver v0.32.1 // indirect
101-
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
102-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
103-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
97+
k8s.io/apiextensions-apiserver v0.33.0 // indirect
98+
k8s.io/apiserver v0.33.0 // indirect
99+
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
100+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
101+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
104102
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
105-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
103+
sigs.k8s.io/randfill v1.0.0 // indirect
104+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
106105
sigs.k8s.io/yaml v1.4.0 // indirect
107106
)

0 commit comments

Comments
 (0)