Skip to content

Commit a474316

Browse files
tstirrat15tstirrat15
committed
chore: upgrade k8s deps
1 parent 4ea3a6d commit a474316

5 files changed

Lines changed: 240 additions & 223 deletions

File tree

‎.github/workflows/build-test.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
88
branches:
99
- "*"
1010
env:
11-
GO_VERSION: "~1.25"
11+
GO_VERSION: "~1.26"
1212
jobs:
1313
unit:
1414
name: "Unit"

‎.github/workflows/lint.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ on: # yamllint disable-line rule:truthy
88
pull_request:
99
branches: ["*"]
1010
env:
11-
GO_VERSION: "~1.25"
11+
GO_VERSION: "~1.26"
1212
jobs:
1313
go-lint:
1414
name: "Lint Go"

‎fileinformer/file_informer.go‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,7 @@ type FileSharedIndexInformer struct {
145145
watcher *fsnotify.Watcher
146146
started bool
147147
synced bool
148+
syncedChan chan struct{}
148149
handlers []cache.ResourceEventHandler
149150
}
150151

@@ -190,6 +191,20 @@ func (f *FileSharedIndexInformer) AddEventHandlerWithResyncPeriod(handler cache.
190191
})
191192
}
192193

194+
func (f *FileSharedIndexInformer) Done() <-chan struct{} {
195+
return f.syncedChan
196+
}
197+
198+
func (f *FileSharedIndexInformer) Name() string {
199+
return "FileSharedIndexInformer"
200+
}
201+
202+
// HasSyncedChecker returns the Informer which implements the DoneChecker interface
203+
// in the Done and Name methods.
204+
func (f *FileSharedIndexInformer) HasSyncedChecker() cache.DoneChecker {
205+
return f
206+
}
207+
193208
// RemoveEventHandler implements cache.SharedInformer
194209
func (*FileSharedIndexInformer) RemoveEventHandler(_ cache.ResourceEventHandlerRegistration) error {
195210
// TODO implement me
@@ -233,6 +248,8 @@ func (f *FileSharedIndexInformer) Run(stopCh <-chan struct{}) {
233248

234249
f.Lock()
235250
f.synced = true
251+
// close the syncedChan to notify any HasSyncedChecker watchers
252+
close(f.syncedChan)
236253
f.Unlock()
237254

238255
go func() {

‎go.mod‎

Lines changed: 67 additions & 67 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
module github.com/authzed/controller-idioms
22

3-
go 1.25.0
3+
go 1.26.0
44

55
require (
66
github.com/authzed/ctxkey v0.0.0-20260210154927-ca132876f62c
77
github.com/cespare/xxhash/v2 v2.3.0
8-
github.com/davecgh/go-spew v1.1.1
8+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
99
github.com/fsnotify/fsnotify v1.9.0
1010
github.com/go-logr/logr v1.4.3
1111
github.com/maxbrunsfeld/counterfeiter/v6 v6.7.0
1212
github.com/prometheus/client_golang v1.23.2
1313
github.com/stretchr/testify v1.11.1
14-
golang.org/x/exp v0.0.0-20260212183809-81e46e3db34a
15-
golang.org/x/sync v0.19.0
16-
k8s.io/api v0.35.1
17-
k8s.io/apiextensions-apiserver v0.35.1
18-
k8s.io/apimachinery v0.35.1
19-
k8s.io/apiserver v0.35.1
20-
k8s.io/cli-runtime v0.35.1
21-
k8s.io/client-go v0.35.1
22-
k8s.io/component-base v0.35.1
23-
k8s.io/controller-manager v0.35.1
24-
k8s.io/klog/v2 v2.130.1
25-
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4
26-
k8s.io/kubectl v0.35.1
27-
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
28-
sigs.k8s.io/structured-merge-diff/v6 v6.3.2
14+
golang.org/x/exp v0.0.0-20260410095643-746e56fc9e2f
15+
golang.org/x/sync v0.20.0
16+
k8s.io/api v0.36.0
17+
k8s.io/apiextensions-apiserver v0.36.0
18+
k8s.io/apimachinery v0.36.0
19+
k8s.io/apiserver v0.36.0
20+
k8s.io/cli-runtime v0.36.0
21+
k8s.io/client-go v0.36.0
22+
k8s.io/component-base v0.36.0
23+
k8s.io/controller-manager v0.36.0
24+
k8s.io/klog/v2 v2.140.0
25+
k8s.io/kube-openapi v0.0.0-20260427204847-8949caaa1199
26+
k8s.io/kubectl v0.36.0
27+
k8s.io/utils v0.0.0-20260319190234-28399d86e0b5
28+
sigs.k8s.io/structured-merge-diff/v6 v6.4.0
2929
)
3030

3131
require (
@@ -39,38 +39,36 @@ require (
3939
github.com/go-logr/stdr v1.2.2 // indirect
4040
github.com/gogo/protobuf v1.3.2 // indirect
4141
github.com/golang/protobuf v1.5.4 // indirect
42-
github.com/google/cel-go v0.27.0 // indirect
43-
github.com/google/go-cmp v0.7.0 // indirect
42+
github.com/google/cel-go v0.28.0 // indirect
4443
github.com/google/uuid v1.6.0 // indirect
45-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
46-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0 // indirect
44+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.29.0 // indirect
4745
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4846
github.com/json-iterator/go v1.1.12 // indirect
4947
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
5048
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
5149
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
52-
github.com/pmezard/go-difflib v1.0.0 // indirect
50+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
5351
github.com/prometheus/client_model v0.6.2 // indirect
5452
github.com/prometheus/common v0.67.5 // indirect
55-
github.com/prometheus/procfs v0.19.2 // indirect
53+
github.com/prometheus/procfs v0.20.1 // indirect
5654
github.com/spf13/cobra v1.10.2 // indirect
5755
github.com/spf13/pflag v1.0.10 // indirect
5856
github.com/stretchr/objx v0.5.2 // indirect
59-
go.etcd.io/etcd/api/v3 v3.6.8 // indirect
60-
go.etcd.io/etcd/client/pkg/v3 v3.6.8 // indirect
61-
go.etcd.io/etcd/client/v3 v3.6.8 // indirect
57+
go.etcd.io/etcd/api/v3 v3.6.10 // indirect
58+
go.etcd.io/etcd/client/pkg/v3 v3.6.10 // indirect
59+
go.etcd.io/etcd/client/v3 v3.6.10 // indirect
6260
go.uber.org/multierr v1.11.0 // indirect
6361
go.uber.org/zap v1.27.1 // indirect
64-
golang.org/x/crypto v0.48.0 // indirect
65-
golang.org/x/net v0.50.0 // indirect
66-
golang.org/x/oauth2 v0.35.0 // indirect
67-
golang.org/x/sys v0.41.0 // indirect
68-
golang.org/x/term v0.40.0 // indirect
69-
golang.org/x/text v0.34.0 // indirect
70-
golang.org/x/time v0.14.0 // indirect
71-
golang.org/x/tools v0.42.0 // indirect
72-
google.golang.org/grpc v1.79.1 // indirect
73-
google.golang.org/protobuf v1.36.11 // indirect
62+
golang.org/x/crypto v0.50.0 // indirect
63+
golang.org/x/net v0.53.0 // indirect
64+
golang.org/x/oauth2 v0.36.0 // indirect
65+
golang.org/x/sys v0.43.0 // indirect
66+
golang.org/x/term v0.42.0 // indirect
67+
golang.org/x/text v0.36.0 // indirect
68+
golang.org/x/time v0.15.0 // indirect
69+
golang.org/x/tools v0.44.0 // indirect
70+
google.golang.org/grpc v1.80.0 // indirect
71+
google.golang.org/protobuf v1.36.12-0.20260120151049-f2248ac996af // indirect
7472
gopkg.in/inf.v0 v0.9.1 // indirect
7573
gopkg.in/yaml.v3 v3.0.1 // indirect
7674
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
@@ -86,25 +84,26 @@ require (
8684
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
8785
github.com/chai2010/gettext-go v1.0.2 // indirect
8886
github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f // indirect
89-
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
87+
github.com/fxamacker/cbor/v2 v2.9.1 // indirect
9088
github.com/go-errors/errors v1.4.2 // indirect
91-
github.com/go-openapi/jsonpointer v0.22.4 // indirect
92-
github.com/go-openapi/jsonreference v0.21.4 // indirect
93-
github.com/go-openapi/swag v0.25.4 // indirect
94-
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
95-
github.com/go-openapi/swag/conv v0.25.4 // indirect
96-
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
97-
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
98-
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
99-
github.com/go-openapi/swag/loading v0.25.4 // indirect
100-
github.com/go-openapi/swag/mangling v0.25.4 // indirect
101-
github.com/go-openapi/swag/netutils v0.25.4 // indirect
102-
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
103-
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
104-
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
89+
github.com/go-openapi/jsonpointer v0.23.1 // indirect
90+
github.com/go-openapi/jsonreference v0.21.5 // indirect
91+
github.com/go-openapi/swag v0.26.0 // indirect
92+
github.com/go-openapi/swag/cmdutils v0.26.0 // indirect
93+
github.com/go-openapi/swag/conv v0.26.0 // indirect
94+
github.com/go-openapi/swag/fileutils v0.26.0 // indirect
95+
github.com/go-openapi/swag/jsonname v0.26.0 // indirect
96+
github.com/go-openapi/swag/jsonutils v0.26.0 // indirect
97+
github.com/go-openapi/swag/loading v0.26.0 // indirect
98+
github.com/go-openapi/swag/mangling v0.26.0 // indirect
99+
github.com/go-openapi/swag/netutils v0.26.0 // indirect
100+
github.com/go-openapi/swag/stringutils v0.26.0 // indirect
101+
github.com/go-openapi/swag/typeutils v0.26.0 // indirect
102+
github.com/go-openapi/swag/yamlutils v0.26.0 // indirect
105103
github.com/google/btree v1.1.3 // indirect
106104
github.com/google/gnostic-models v0.7.1 // indirect
107-
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
105+
github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.1.0 // indirect
106+
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.3 // indirect
108107
github.com/kylelemons/godebug v1.1.0 // indirect
109108
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
110109
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
@@ -115,22 +114,23 @@ require (
115114
github.com/x448/float16 v0.8.4 // indirect
116115
github.com/xlab/treeprint v1.2.0 // indirect
117116
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
118-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.65.0 // indirect
119-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.65.0 // indirect
120-
go.opentelemetry.io/otel v1.40.0 // indirect
121-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.40.0 // indirect
122-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.40.0 // indirect
123-
go.opentelemetry.io/otel/metric v1.40.0 // indirect
124-
go.opentelemetry.io/otel/sdk v1.40.0 // indirect
125-
go.opentelemetry.io/otel/trace v1.40.0 // indirect
126-
go.opentelemetry.io/proto/otlp v1.9.0 // indirect
127-
go.yaml.in/yaml/v2 v2.4.3 // indirect
117+
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.68.0 // indirect
118+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.68.0 // indirect
119+
go.opentelemetry.io/otel v1.43.0 // indirect
120+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.43.0 // indirect
121+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.43.0 // indirect
122+
go.opentelemetry.io/otel/metric v1.43.0 // indirect
123+
go.opentelemetry.io/otel/sdk v1.43.0 // indirect
124+
go.opentelemetry.io/otel/trace v1.43.0 // indirect
125+
go.opentelemetry.io/proto/otlp v1.10.0 // indirect
126+
go.yaml.in/yaml/v2 v2.4.4 // indirect
128127
go.yaml.in/yaml/v3 v3.0.4 // indirect
129-
golang.org/x/mod v0.33.0 // indirect
130-
google.golang.org/genproto/googleapis/api v0.0.0-20260217215200-42d3e9bedb6d // indirect
131-
google.golang.org/genproto/googleapis/rpc v0.0.0-20260217215200-42d3e9bedb6d // indirect
128+
golang.org/x/mod v0.35.0 // indirect
129+
google.golang.org/genproto/googleapis/api v0.0.0-20260427160629-7cedc36a6bc4 // indirect
130+
google.golang.org/genproto/googleapis/rpc v0.0.0-20260427160629-7cedc36a6bc4 // indirect
132131
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
133-
sigs.k8s.io/kustomize/api v0.20.1 // indirect
134-
sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
132+
k8s.io/streaming v0.36.0 // indirect
133+
sigs.k8s.io/kustomize/api v0.21.1 // indirect
134+
sigs.k8s.io/kustomize/kyaml v0.21.1 // indirect
135135
sigs.k8s.io/randfill v1.0.0 // indirect
136136
)

0 commit comments

Comments
 (0)