Skip to content

Commit 3b11c57

Browse files
zeroalphatzeroalphat
committed
Update dependencies
Signed-off-by: zeroalphat <taichi-takemura@cybozu.co.jp>
1 parent fcc50bf commit 3b11c57

File tree

20 files changed

+447
-375
lines changed

20 files changed

+447
-375
lines changed

‎Makefile‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
include ./Makefile.common
2-
ENVTEST_K8S_VERSION = 1.31.0
2+
ENVTEST_K8S_VERSION = 1.34.0
33

44
# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
55
ifeq (,$(shell go env GOBIN))
@@ -145,15 +145,15 @@ KAPTEST ?= $(LOCALBIN)/kaptest
145145
YQ ?= $(LOCALBIN)/yq
146146

147147
## Tool Versions
148-
KUSTOMIZE_VERSION ?= v5.6.0
149-
CONTROLLER_TOOLS_VERSION ?= v0.17.2
150-
ENVTEST_VERSION ?= release-0.20
151-
GOLANGCI_LINT_VERSION ?= v2.1.6
152-
GINKGO_VERSION ?= v2.23.4
153-
CODE_GENERATOR_VERSION ?= v0.31.1
154-
MODELS_SCHEMA_VERSION ?= v1.31.1
148+
KUSTOMIZE_VERSION ?= v5.7.1
149+
CONTROLLER_TOOLS_VERSION ?= v0.19.0
150+
ENVTEST_VERSION ?= release-0.22
151+
GOLANGCI_LINT_VERSION ?= v2.4.0
152+
GINKGO_VERSION ?= v2.25.3
153+
CODE_GENERATOR_VERSION ?= v0.34.1
154+
MODELS_SCHEMA_VERSION ?= v1.34.1
155155
KAPTEST_VERSION ?= v0.1.2
156-
YQ_VERSION ?= v4.47.1
156+
YQ_VERSION ?= v4.47.2
157157

158158
.PHONY: kustomize
159159
kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
@@ -228,7 +228,7 @@ ln -sf $(1)-$(3) $(1)
228228
endef
229229

230230
# Tool versions
231-
MDBOOK_VERSION = 0.4.43
231+
MDBOOK_VERSION = 0.4.52
232232
MDBOOK := $(LOCALBIN)/mdbook
233233

234234
.PHONY: book

‎charts/ofen/templates/generated/crds/crds.yaml‎

Lines changed: 2 additions & 2 deletions
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.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
helm.sh/resource-policy: '{{ .Values.crds.keep | ternary "keep" "delete" }}'
88
labels:
99
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -221,7 +221,7 @@ apiVersion: apiextensions.k8s.io/v1
221221
kind: CustomResourceDefinition
222222
metadata:
223223
annotations:
224-
controller-gen.kubebuilder.io/version: v0.17.2
224+
controller-gen.kubebuilder.io/version: v0.19.0
225225
helm.sh/resource-policy: '{{ .Values.crds.keep | ternary "keep" "delete" }}'
226226
labels:
227227
app.kubernetes.io/managed-by: '{{ .Release.Service }}'

‎config/crd/bases/ofen.cybozu.io_imageprefetches.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.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: imageprefetches.ofen.cybozu.io
88
spec:
99
group: ofen.cybozu.io

‎config/crd/bases/ofen.cybozu.io_nodeimagesets.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.2
6+
controller-gen.kubebuilder.io/version: v0.19.0
77
name: nodeimagesets.ofen.cybozu.io
88
spec:
99
group: ofen.cybozu.io

‎dockerfiles/Dockerfile.imageprefetch-controller‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build controller binary
2-
FROM ghcr.io/cybozu/golang:1.24-noble AS builder
2+
FROM ghcr.io/cybozu/golang:1.25-noble AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎dockerfiles/Dockerfile.nodeimageset-controller‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build controller binary
2-
FROM ghcr.io/cybozu/golang:1.24-noble AS builder
2+
FROM ghcr.io/cybozu/golang:1.25-noble AS builder
33
ARG TARGETOS
44
ARG TARGETARCH
55

‎go.mod‎

Lines changed: 96 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,36 @@
11
module github.com/cybozu-go/ofen
22

3-
go 1.24.1
3+
go 1.25.1
44

55
require (
6-
github.com/containerd/containerd v1.7.27
7-
github.com/containerd/containerd/api v1.8.0
8-
github.com/containerd/containerd/v2 v2.0.4
6+
github.com/containerd/containerd/api v1.9.0
7+
github.com/containerd/containerd/v2 v2.1.4
8+
github.com/containerd/errdefs v1.0.0
99
github.com/containerd/typeurl/v2 v2.2.3
10-
github.com/go-logr/logr v1.4.2
11-
github.com/onsi/ginkgo/v2 v2.23.4
12-
github.com/onsi/gomega v1.36.3
13-
github.com/stretchr/testify v1.10.0
14-
k8s.io/api v0.31.2
15-
k8s.io/apimachinery v0.31.2
16-
k8s.io/client-go v0.31.2
17-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
18-
sigs.k8s.io/controller-runtime v0.19.0
19-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
10+
github.com/go-logr/logr v1.4.3
11+
github.com/onsi/ginkgo/v2 v2.25.3
12+
github.com/onsi/gomega v1.38.2
13+
github.com/stretchr/testify v1.11.1
14+
k8s.io/api v0.34.1
15+
k8s.io/apimachinery v0.34.1
16+
k8s.io/client-go v0.34.1
17+
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
18+
sigs.k8s.io/controller-runtime v0.22.1
19+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0
2020
)
2121

2222
require (
23-
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
24-
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
23+
cel.dev/expr v0.24.0 // indirect
24+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2525
github.com/Microsoft/go-winio v0.6.2 // indirect
26-
github.com/Microsoft/hcsshim v0.12.9 // indirect
27-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
28-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
26+
github.com/Microsoft/hcsshim v0.13.0 // indirect
27+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
2928
github.com/beorn7/perks v1.0.1 // indirect
3029
github.com/blang/semver/v4 v4.0.0 // indirect
31-
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
30+
github.com/cenkalti/backoff/v5 v5.0.3 // indirect
3231
github.com/cespare/xxhash/v2 v2.3.0 // indirect
33-
github.com/containerd/cgroups/v3 v3.0.3 // indirect
34-
github.com/containerd/continuity v0.4.4 // indirect
35-
github.com/containerd/errdefs v1.0.0 // indirect
32+
github.com/containerd/cgroups/v3 v3.0.5 // indirect
33+
github.com/containerd/continuity v0.4.5 // indirect
3634
github.com/containerd/errdefs/pkg v0.3.0 // indirect
3735
github.com/containerd/fifo v1.1.0 // indirect
3836
github.com/containerd/log v0.1.0 // indirect
@@ -41,94 +39,107 @@ require (
4139
github.com/containerd/ttrpc v1.2.7 // indirect
4240
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4341
github.com/distribution/reference v0.6.0 // indirect
44-
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
45-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
42+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
43+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
4644
github.com/felixge/httpsnoop v1.0.4 // indirect
47-
github.com/fsnotify/fsnotify v1.7.0 // indirect
48-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
45+
github.com/fsnotify/fsnotify v1.9.0 // indirect
46+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
4947
github.com/go-logr/stdr v1.2.2 // indirect
5048
github.com/go-logr/zapr v1.3.0 // indirect
51-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
52-
github.com/go-openapi/jsonreference v0.20.2 // indirect
53-
github.com/go-openapi/swag v0.22.4 // indirect
49+
github.com/go-openapi/jsonpointer v0.22.0 // indirect
50+
github.com/go-openapi/jsonreference v0.21.1 // indirect
51+
github.com/go-openapi/swag v0.24.1 // indirect
52+
github.com/go-openapi/swag/cmdutils v0.24.0 // indirect
53+
github.com/go-openapi/swag/conv v0.24.0 // indirect
54+
github.com/go-openapi/swag/fileutils v0.24.0 // indirect
55+
github.com/go-openapi/swag/jsonname v0.24.0 // indirect
56+
github.com/go-openapi/swag/jsonutils v0.24.0 // indirect
57+
github.com/go-openapi/swag/loading v0.24.0 // indirect
58+
github.com/go-openapi/swag/mangling v0.24.0 // indirect
59+
github.com/go-openapi/swag/netutils v0.24.0 // indirect
60+
github.com/go-openapi/swag/stringutils v0.24.0 // indirect
61+
github.com/go-openapi/swag/typeutils v0.24.0 // indirect
62+
github.com/go-openapi/swag/yamlutils v0.24.0 // indirect
5463
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
5564
github.com/gogo/protobuf v1.3.2 // indirect
56-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
57-
github.com/golang/protobuf v1.5.4 // indirect
58-
github.com/google/cel-go v0.20.1 // indirect
59-
github.com/google/gnostic-models v0.6.8 // indirect
65+
github.com/golang/groupcache v0.0.0-20241129210726-2c02b8208cf8 // indirect
66+
github.com/google/btree v1.1.3 // indirect
67+
github.com/google/cel-go v0.26.1 // indirect
68+
github.com/google/gnostic-models v0.7.0 // indirect
6069
github.com/google/go-cmp v0.7.0 // indirect
61-
github.com/google/gofuzz v1.2.0 // indirect
62-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
70+
github.com/google/pprof v0.0.0-20250903194437-c28834ac2320 // indirect
6371
github.com/google/uuid v1.6.0 // indirect
64-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
65-
github.com/imdario/mergo v0.3.6 // indirect
72+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.27.2 // indirect
6673
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6774
github.com/josharian/intern v1.0.0 // indirect
6875
github.com/json-iterator/go v1.1.12 // indirect
69-
github.com/klauspost/compress v1.17.11 // indirect
70-
github.com/mailru/easyjson v0.7.7 // indirect
76+
github.com/klauspost/compress v1.18.0 // indirect
77+
github.com/mailru/easyjson v0.9.0 // indirect
7178
github.com/moby/locker v1.0.1 // indirect
7279
github.com/moby/sys/mountinfo v0.7.2 // indirect
7380
github.com/moby/sys/sequential v0.6.0 // indirect
7481
github.com/moby/sys/signal v0.7.1 // indirect
75-
github.com/moby/sys/user v0.3.0 // indirect
82+
github.com/moby/sys/user v0.4.0 // indirect
7683
github.com/moby/sys/userns v0.1.0 // indirect
7784
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
78-
github.com/modern-go/reflect2 v1.0.2 // indirect
85+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
7986
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8087
github.com/opencontainers/go-digest v1.0.0 // indirect
81-
github.com/opencontainers/image-spec v1.1.0 // indirect
82-
github.com/opencontainers/runtime-spec v1.2.0 // indirect
83-
github.com/opencontainers/selinux v1.11.1 // indirect
84-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
88+
github.com/opencontainers/image-spec v1.1.1 // indirect
89+
github.com/opencontainers/runtime-spec v1.2.1 // indirect
90+
github.com/opencontainers/selinux v1.12.0 // indirect
91+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
8592
github.com/pkg/errors v0.9.1 // indirect
8693
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
87-
github.com/prometheus/client_golang v1.20.5 // indirect
88-
github.com/prometheus/client_model v0.6.1 // indirect
89-
github.com/prometheus/common v0.55.0 // indirect
90-
github.com/prometheus/procfs v0.15.1 // indirect
94+
github.com/prometheus/client_golang v1.23.2 // indirect
95+
github.com/prometheus/client_model v0.6.2 // indirect
96+
github.com/prometheus/common v0.66.1 // indirect
97+
github.com/prometheus/procfs v0.17.0 // indirect
9198
github.com/sirupsen/logrus v1.9.3 // indirect
92-
github.com/spf13/cobra v1.8.1 // indirect
93-
github.com/spf13/pflag v1.0.6 // indirect
94-
github.com/stoewer/go-strcase v1.2.0 // indirect
99+
github.com/spf13/cobra v1.10.1 // indirect
100+
github.com/spf13/pflag v1.0.10 // indirect
101+
github.com/stoewer/go-strcase v1.3.1 // indirect
95102
github.com/x448/float16 v0.8.4 // indirect
96103
go.opencensus.io v0.24.0 // indirect
97-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.56.0 // indirect
98-
go.opentelemetry.io/otel v1.31.0 // indirect
99-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.31.0 // indirect
100-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.31.0 // indirect
101-
go.opentelemetry.io/otel/metric v1.31.0 // indirect
102-
go.opentelemetry.io/otel/sdk v1.31.0 // indirect
103-
go.opentelemetry.io/otel/trace v1.31.0 // indirect
104-
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
104+
go.opentelemetry.io/auto/sdk v1.2.0 // indirect
105+
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0 // indirect
106+
go.opentelemetry.io/otel v1.38.0 // indirect
107+
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.38.0 // indirect
108+
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.38.0 // indirect
109+
go.opentelemetry.io/otel/metric v1.38.0 // indirect
110+
go.opentelemetry.io/otel/sdk v1.38.0 // indirect
111+
go.opentelemetry.io/otel/trace v1.38.0 // indirect
112+
go.opentelemetry.io/proto/otlp v1.8.0 // indirect
105113
go.uber.org/automaxprocs v1.6.0 // indirect
106114
go.uber.org/multierr v1.11.0 // indirect
107-
go.uber.org/zap v1.26.0 // indirect
108-
golang.org/x/exp v0.0.0-20231214170342-aacd6d4b4611 // indirect
109-
golang.org/x/net v0.37.0 // indirect
110-
golang.org/x/oauth2 v0.23.0 // indirect
111-
golang.org/x/sync v0.12.0 // indirect
112-
golang.org/x/sys v0.32.0 // indirect
113-
golang.org/x/term v0.30.0 // indirect
114-
golang.org/x/text v0.23.0 // indirect
115-
golang.org/x/time v0.3.0 // indirect
116-
golang.org/x/tools v0.31.0 // indirect
117-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
118-
google.golang.org/genproto/googleapis/api v0.0.0-20241007155032-5fefd90f89a9 // indirect
119-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241021214115-324edc3d5d38 // indirect
120-
google.golang.org/grpc v1.68.1 // indirect
121-
google.golang.org/protobuf v1.36.5 // indirect
122-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
115+
go.uber.org/zap v1.27.0 // indirect
116+
go.yaml.in/yaml/v2 v2.4.3 // indirect
117+
go.yaml.in/yaml/v3 v3.0.4 // indirect
118+
golang.org/x/exp v0.0.0-20250911091902-df9299821621 // indirect
119+
golang.org/x/net v0.44.0 // indirect
120+
golang.org/x/oauth2 v0.31.0 // indirect
121+
golang.org/x/sync v0.17.0 // indirect
122+
golang.org/x/sys v0.36.0 // indirect
123+
golang.org/x/term v0.35.0 // indirect
124+
golang.org/x/text v0.29.0 // indirect
125+
golang.org/x/time v0.13.0 // indirect
126+
golang.org/x/tools v0.37.0 // indirect
127+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
128+
google.golang.org/genproto/googleapis/api v0.0.0-20250908214217-97024824d090 // indirect
129+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250908214217-97024824d090 // indirect
130+
google.golang.org/grpc v1.75.1 // indirect
131+
google.golang.org/protobuf v1.36.9 // indirect
132+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
123133
gopkg.in/inf.v0 v0.9.1 // indirect
124-
gopkg.in/yaml.v2 v2.4.0 // indirect
125134
gopkg.in/yaml.v3 v3.0.1 // indirect
126-
k8s.io/apiextensions-apiserver v0.31.0 // indirect
127-
k8s.io/apiserver v0.31.2 // indirect
128-
k8s.io/component-base v0.31.2 // indirect
135+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
136+
k8s.io/apiserver v0.34.1 // indirect
137+
k8s.io/component-base v0.34.1 // indirect
129138
k8s.io/klog/v2 v2.130.1 // indirect
130-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
131-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.30.3 // indirect
132-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
133-
sigs.k8s.io/yaml v1.4.0 // indirect
139+
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 // indirect
140+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.33.0 // indirect
141+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
142+
sigs.k8s.io/randfill v1.0.0 // indirect
143+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
144+
sigs.k8s.io/yaml v1.6.0 // indirect
134145
)

0 commit comments

Comments
 (0)