Skip to content

Commit 7b33761

Browse files
johngmyersjohngmyers
authored
chore: Upgrade controller-runtime to v0.18.7 (#1938)
* Upgrade controller-runtime to v0.18.7 * Consolidate go.mod indirect dependency blocks
1 parent 85af4cd commit 7b33761

File tree

10 files changed

+260
-289
lines changed

10 files changed

+260
-289
lines changed

‎cmd/secrets-store-csi-driver/main.go‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import (
2525
"strings"
2626
"time"
2727

28+
"sigs.k8s.io/controller-runtime/pkg/client"
29+
metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
2830
secretsstorev1 "sigs.k8s.io/secrets-store-csi-driver/apis/v1"
2931
"sigs.k8s.io/secrets-store-csi-driver/controllers"
3032
"sigs.k8s.io/secrets-store-csi-driver/pkg/k8s"
@@ -35,13 +37,11 @@ import (
3537

3638
"google.golang.org/grpc"
3739
corev1 "k8s.io/api/core/v1"
38-
"k8s.io/apimachinery/pkg/api/meta"
3940
"k8s.io/apimachinery/pkg/fields"
4041
"k8s.io/apimachinery/pkg/labels"
4142
"k8s.io/apimachinery/pkg/runtime"
4243
"k8s.io/client-go/kubernetes"
4344
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
44-
"k8s.io/client-go/rest"
4545
"k8s.io/klog/v2"
4646
"monis.app/mlog"
4747
ctrl "sigs.k8s.io/controller-runtime"
@@ -129,14 +129,12 @@ func mainErr() error {
129129
cfg.UserAgent = version.GetUserAgent("controller")
130130

131131
mgr, err := ctrl.NewManager(cfg, ctrl.Options{
132-
Scheme: scheme,
133-
MetricsBindAddress: *metricsAddr,
134-
LeaderElection: false,
135-
MapperProvider: func(c *rest.Config) (meta.RESTMapper, error) {
136-
return apiutil.NewDynamicRESTMapper(c, apiutil.WithLazyDiscovery)
137-
},
138-
NewCache: cache.BuilderWithOptions(cache.Options{
139-
SelectorsByObject: cache.SelectorsByObject{
132+
Scheme: scheme,
133+
Metrics: metricsserver.Options{BindAddress: *metricsAddr},
134+
LeaderElection: false,
135+
MapperProvider: apiutil.NewDynamicRESTMapper,
136+
Cache: cache.Options{
137+
ByObject: map[client.Object]cache.ByObject{
140138
// this enables filtered watch of pods based on the node name
141139
// only pods running on the same node as the csi driver will be cached
142140
&corev1.Pod{}: {
@@ -161,7 +159,7 @@ func mainErr() error {
161159
),
162160
},
163161
},
164-
}),
162+
},
165163
})
166164
if err != nil {
167165
klog.ErrorS(err, "failed to start manager")

‎go.mod‎

Lines changed: 52 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -4,54 +4,54 @@ go 1.24.7
44

55
require (
66
github.com/container-storage-interface/spec v1.6.0
7-
github.com/google/go-cmp v0.5.9
7+
github.com/google/go-cmp v0.7.0
88
github.com/kubernetes-csi/csi-lib-utils v0.10.0
99
github.com/kubernetes-csi/csi-test/v4 v4.3.0
10-
github.com/onsi/gomega v1.27.4
11-
github.com/prometheus/client_golang v1.15.0
12-
github.com/stretchr/testify v1.8.2
13-
go.opentelemetry.io/otel v1.15.1
14-
go.opentelemetry.io/otel/exporters/prometheus v0.38.1
15-
go.opentelemetry.io/otel/metric v0.38.1
16-
google.golang.org/grpc v1.56.3
17-
google.golang.org/protobuf v1.33.0
18-
k8s.io/api v0.26.4
19-
k8s.io/apimachinery v0.26.4
20-
k8s.io/client-go v0.26.4
21-
k8s.io/klog/v2 v2.100.1
10+
github.com/onsi/gomega v1.32.0
11+
github.com/prometheus/client_golang v1.23.0
12+
github.com/stretchr/testify v1.11.1
13+
go.opentelemetry.io/otel v1.38.0
14+
go.opentelemetry.io/otel/exporters/prometheus v0.60.0
15+
go.opentelemetry.io/otel/metric v1.38.0
16+
google.golang.org/grpc v1.58.3
17+
google.golang.org/protobuf v1.36.8
18+
k8s.io/api v0.30.1
19+
k8s.io/apimachinery v0.30.1
20+
k8s.io/client-go v0.30.1
21+
k8s.io/klog/v2 v2.120.1
2222
k8s.io/mount-utils v0.26.4
23-
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
23+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
2424
monis.app/mlog v0.0.2
25-
sigs.k8s.io/controller-runtime v0.14.6
25+
sigs.k8s.io/controller-runtime v0.18.7
2626
)
2727

2828
require (
2929
github.com/beorn7/perks v1.0.1 // indirect
3030
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cespare/xxhash/v2 v2.2.0 // indirect
31+
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/davecgh/go-spew v1.1.1 // indirect
33-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
34-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
35-
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
36-
github.com/fsnotify/fsnotify v1.6.0 // indirect
37-
github.com/go-logr/logr v1.2.4 // indirect
33+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
34+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
35+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
36+
github.com/fsnotify/fsnotify v1.7.0 // indirect
37+
github.com/go-logr/logr v1.4.3 // indirect
3838
github.com/go-logr/stdr v1.2.2 // indirect
39-
github.com/go-logr/zapr v1.2.3 // indirect
39+
github.com/go-logr/zapr v1.3.0 // indirect
4040
github.com/go-openapi/jsonpointer v0.19.6 // indirect
41-
github.com/go-openapi/jsonreference v0.20.1 // indirect
41+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4242
github.com/go-openapi/swag v0.22.3 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4545
github.com/golang/protobuf v1.5.4 // indirect
46-
github.com/google/gnostic v0.5.7-v3refs // indirect
46+
github.com/google/gnostic-models v0.6.8 // indirect
4747
github.com/google/gofuzz v1.2.0 // indirect
48-
github.com/google/uuid v1.3.0 // indirect
48+
github.com/google/uuid v1.6.0 // indirect
49+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
4950
github.com/imdario/mergo v0.3.12 // indirect
50-
github.com/inconshreveable/mousetrap v1.0.1 // indirect
51+
github.com/inconshreveable/mousetrap v1.1.0 // indirect
5152
github.com/josharian/intern v1.0.0 // indirect
5253
github.com/json-iterator/go v1.1.12 // indirect
5354
github.com/mailru/easyjson v0.7.7 // indirect
54-
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
5555
github.com/moby/sys/mountinfo v0.6.2 // indirect
5656
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5757
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -60,34 +60,36 @@ require (
6060
github.com/onsi/ginkgo v1.16.5 // indirect
6161
github.com/pkg/errors v0.9.1 // indirect
6262
github.com/pmezard/go-difflib v1.0.0 // indirect
63-
github.com/prometheus/client_model v0.3.0 // indirect
64-
github.com/prometheus/common v0.42.0 // indirect
65-
github.com/prometheus/procfs v0.9.0 // indirect
66-
github.com/spf13/cobra v1.6.1 // indirect
63+
github.com/prometheus/client_model v0.6.2 // indirect
64+
github.com/prometheus/common v0.65.0 // indirect
65+
github.com/prometheus/otlptranslator v0.0.2 // indirect
66+
github.com/prometheus/procfs v0.17.0 // indirect
67+
github.com/spf13/cobra v1.7.0 // indirect
6768
github.com/spf13/pflag v1.0.5 // indirect
68-
go.opentelemetry.io/otel/sdk v1.15.1 // indirect
69-
go.opentelemetry.io/otel/sdk/metric v0.38.1
70-
go.opentelemetry.io/otel/trace v1.15.1 // indirect
71-
go.uber.org/atomic v1.10.0 // indirect
72-
go.uber.org/multierr v1.8.0 // indirect
73-
go.uber.org/zap v1.24.0 // indirect
74-
golang.org/x/crypto v0.36.0
75-
golang.org/x/net v0.38.0 // indirect
76-
golang.org/x/oauth2 v0.27.0 // indirect
77-
golang.org/x/sys v0.31.0 // indirect
78-
golang.org/x/term v0.30.0 // indirect
79-
golang.org/x/text v0.23.0 // indirect
69+
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
70+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
71+
go.opentelemetry.io/otel/sdk/metric v1.38.0
72+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
73+
go.uber.org/multierr v1.11.0 // indirect
74+
go.uber.org/zap v1.26.0 // indirect
75+
golang.org/x/crypto v0.38.0
76+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
77+
golang.org/x/net v0.40.0 // indirect
78+
golang.org/x/oauth2 v0.30.0 // indirect
79+
golang.org/x/sys v0.35.0 // indirect
80+
golang.org/x/term v0.32.0 // indirect
81+
golang.org/x/text v0.25.0 // indirect
8082
golang.org/x/time v0.3.0 // indirect
81-
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
82-
google.golang.org/genproto v0.0.0-20230410155749-daa745c078e1 // indirect
83+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
84+
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
8385
gopkg.in/inf.v0 v0.9.1 // indirect
8486
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
8587
gopkg.in/yaml.v2 v2.4.0 // indirect
8688
gopkg.in/yaml.v3 v3.0.1 // indirect
87-
k8s.io/apiextensions-apiserver v0.26.4 // indirect
88-
k8s.io/component-base v0.26.4 // indirect
89-
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
89+
k8s.io/apiextensions-apiserver v0.30.1 // indirect
90+
k8s.io/component-base v0.30.1 // indirect
91+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
9092
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
91-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
92-
sigs.k8s.io/yaml v1.3.0 // indirect
93+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
94+
sigs.k8s.io/yaml v1.4.0 // indirect
9395
)

0 commit comments

Comments
 (0)