Skip to content

Commit d2218dc

Browse files
Update k8s packages (minor) (#310)
* Update k8s packages * Adapt to generic controller * Drop obsolete `RecoverPanic=true` --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Tim Ebert <[email protected]>
1 parent d3f8578 commit d2218dc

File tree

12 files changed

+229
-228
lines changed

12 files changed

+229
-228
lines changed

cmd/sharder/app/options.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ import (
3838
"sigs.k8s.io/controller-runtime/pkg/cache"
3939
"sigs.k8s.io/controller-runtime/pkg/client"
4040
"sigs.k8s.io/controller-runtime/pkg/client/config"
41-
controllerconfig "sigs.k8s.io/controller-runtime/pkg/config"
4241
"sigs.k8s.io/controller-runtime/pkg/log/zap"
4342
"sigs.k8s.io/controller-runtime/pkg/manager"
4443
"sigs.k8s.io/controller-runtime/pkg/metrics/filters"
@@ -117,9 +116,6 @@ func (o *options) complete() error {
117116
Scheme: scheme,
118117
// allows us to quickly handover leadership on restarts
119118
LeaderElectionReleaseOnCancel: true,
120-
Controller: controllerconfig.Controller{
121-
RecoverPanic: ptr.To(true),
122-
},
123119
}
124120
o.applyConfigToManagerOptions()
125121
o.applyCacheOptions()

go.mod

Lines changed: 30 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -16,28 +16,30 @@ require (
1616
go.uber.org/automaxprocs v1.6.0
1717
go.uber.org/zap v1.27.0
1818
gomodules.xyz/jsonpatch/v2 v2.4.0
19-
k8s.io/api v0.30.9
20-
k8s.io/apimachinery v0.30.9
21-
k8s.io/client-go v0.30.9
22-
k8s.io/code-generator v0.30.9
23-
k8s.io/component-base v0.30.9
19+
k8s.io/api v0.31.0
20+
k8s.io/apimachinery v0.31.0
21+
k8s.io/client-go v0.31.0
22+
k8s.io/code-generator v0.31.0
23+
k8s.io/component-base v0.31.0
2424
k8s.io/klog/v2 v2.130.1
2525
k8s.io/utils v0.0.0-20241210054802-24370beab758
26-
sigs.k8s.io/controller-runtime v0.18.7
26+
sigs.k8s.io/controller-runtime v0.19.0
2727
sigs.k8s.io/controller-runtime/tools/setup-envtest v0.0.0-20240116072139-11e5a5e261ac // v0.17.0
2828
)
2929

3030
require (
31-
github.com/antlr/antlr4/runtime/Go/antlr/v4 v4.0.0-20230305170008-8188dc5388df // indirect
31+
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
32+
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3233
github.com/beorn7/perks v1.0.1 // indirect
3334
github.com/blang/semver/v4 v4.0.0 // indirect
34-
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
35-
github.com/davecgh/go-spew v1.1.1 // indirect
35+
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
36+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
3637
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3738
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3839
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3940
github.com/felixge/httpsnoop v1.0.4 // indirect
4041
github.com/fsnotify/fsnotify v1.7.0 // indirect
42+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
4143
github.com/go-logr/stdr v1.2.2 // indirect
4244
github.com/go-logr/zapr v1.3.0 // indirect
4345
github.com/go-openapi/jsonpointer v0.20.0 // indirect
@@ -47,11 +49,11 @@ require (
4749
github.com/gogo/protobuf v1.3.2 // indirect
4850
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4951
github.com/golang/protobuf v1.5.4 // indirect
50-
github.com/google/cel-go v0.17.8 // indirect
52+
github.com/google/cel-go v0.20.1 // indirect
5153
github.com/google/gnostic-models v0.6.8 // indirect
5254
github.com/google/gofuzz v1.2.0 // indirect
5355
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
54-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.18.1 // indirect
56+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
5557
github.com/hashicorp/errwrap v1.1.0 // indirect
5658
github.com/imdario/mergo v0.3.16 // indirect
5759
github.com/inconshreveable/mousetrap v1.1.0 // indirect
@@ -66,17 +68,17 @@ require (
6668
github.com/prometheus/client_model v0.6.1 // indirect
6769
github.com/prometheus/common v0.55.0 // indirect
6870
github.com/prometheus/procfs v0.15.1 // indirect
69-
github.com/rogpeppe/go-internal v1.12.0 // indirect
7071
github.com/spf13/afero v1.10.0 // indirect
7172
github.com/stoewer/go-strcase v1.3.0 // indirect
72-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.46.1 // indirect
73-
go.opentelemetry.io/otel v1.21.0 // indirect
74-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.21.0 // indirect
75-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.21.0 // indirect
76-
go.opentelemetry.io/otel/metric v1.21.0 // indirect
77-
go.opentelemetry.io/otel/sdk v1.21.0 // indirect
78-
go.opentelemetry.io/otel/trace v1.21.0 // indirect
79-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
73+
github.com/x448/float16 v0.8.4 // indirect
74+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.53.0 // indirect
75+
go.opentelemetry.io/otel v1.28.0 // indirect
76+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
77+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.27.0 // indirect
78+
go.opentelemetry.io/otel/metric v1.28.0 // indirect
79+
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
80+
go.opentelemetry.io/otel/trace v1.28.0 // indirect
81+
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
8082
go.uber.org/multierr v1.11.0 // indirect
8183
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
8284
golang.org/x/mod v0.22.0 // indirect
@@ -88,18 +90,19 @@ require (
8890
golang.org/x/text v0.21.0 // indirect
8991
golang.org/x/time v0.5.0 // indirect
9092
golang.org/x/tools v0.28.0 // indirect
91-
google.golang.org/genproto/googleapis/api v0.0.0-20231212172506-995d672761c0 // indirect
92-
google.golang.org/genproto/googleapis/rpc v0.0.0-20231212172506-995d672761c0 // indirect
93-
google.golang.org/grpc v1.60.1 // indirect
94-
google.golang.org/protobuf v1.36.1 // indirect
93+
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
94+
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
95+
google.golang.org/grpc v1.65.0 // indirect
96+
google.golang.org/protobuf v1.36.2 // indirect
97+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9598
gopkg.in/inf.v0 v0.9.1 // indirect
9699
gopkg.in/yaml.v2 v2.4.0 // indirect
97100
gopkg.in/yaml.v3 v3.0.1 // indirect
98-
k8s.io/apiextensions-apiserver v0.30.1 // indirect
99-
k8s.io/apiserver v0.30.1 // indirect
101+
k8s.io/apiextensions-apiserver v0.31.0 // indirect
102+
k8s.io/apiserver v0.31.0 // indirect
100103
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
101104
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
102-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
105+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
103106
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
104107
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
105108
sigs.k8s.io/yaml v1.4.0 // indirect

0 commit comments

Comments
 (0)