Skip to content

Commit 40e3476

Browse files
authored
Merge pull request #1840 from cybozu/update-k8s-1.34
Update for Kubernetes 1.34
2 parents 4744dce + 7cae650 commit 40e3476

File tree

32 files changed

+281
-253
lines changed

32 files changed

+281
-253
lines changed

admission/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
CONTROLLER_TOOLS_VERSION = 0.19.0
2-
KUSTOMIZE_VERSION = 5.7.1
1+
CONTROLLER_TOOLS_VERSION = 0.20.1
2+
KUSTOMIZE_VERSION = 5.8.1
33
CONTOUR_VERSION = 1.33.0
44
ARGOCD_VERSION = 3.0.23
55
GRAFANA_OPERATOR_VERSION = 5.18.0
6-
ENVTEST_K8S_VERSION = 1.33.0
6+
ENVTEST_K8S_VERSION = 1.34.0
77

88
# Specify envtest branch according to controller-runtime version
99
CONTROLLER_RUNTIME_VERSION := $(shell awk '$$1 == "sigs.k8s.io/controller-runtime" {print substr($$2, 2)}' go.mod)

admission/TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.1.1
1+
1.1.2

admission/go.mod

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,49 @@
11
module github.com/cybozu/neco-containers/admission
22

3-
go 1.25.0
3+
go 1.25.7
44

55
require (
66
github.com/go-logr/logr v1.4.3
7-
github.com/onsi/ginkgo/v2 v2.27.3
8-
github.com/onsi/gomega v1.38.3
7+
github.com/onsi/ginkgo/v2 v2.28.1
8+
github.com/onsi/gomega v1.39.1
99
github.com/spf13/cobra v1.10.2
10-
k8s.io/api v0.33.7
11-
k8s.io/apimachinery v0.33.7
12-
k8s.io/client-go v0.33.7
10+
k8s.io/api v0.34.1
11+
k8s.io/apimachinery v0.34.1
12+
k8s.io/client-go v0.34.1
1313
k8s.io/klog/v2 v2.130.1
14-
sigs.k8s.io/controller-runtime v0.21.0
14+
sigs.k8s.io/controller-runtime v0.22.4
1515
sigs.k8s.io/yaml v1.6.0
1616
)
1717

1818
require (
1919
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2020
github.com/beorn7/perks v1.0.1 // indirect
21-
github.com/blang/semver/v4 v4.0.0 // indirect
2221
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2322
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
24-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
23+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
2524
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
26-
github.com/fsnotify/fsnotify v1.8.0 // indirect
27-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
25+
github.com/fsnotify/fsnotify v1.9.0 // indirect
26+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2827
github.com/go-logr/zapr v1.3.0 // indirect
2928
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3029
github.com/go-openapi/jsonreference v0.21.0 // indirect
3130
github.com/go-openapi/swag v0.23.0 // indirect
3231
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3332
github.com/gogo/protobuf v1.3.2 // indirect
3433
github.com/google/btree v1.1.3 // indirect
35-
github.com/google/gnostic-models v0.6.9 // indirect
34+
github.com/google/gnostic-models v0.7.0 // indirect
3635
github.com/google/go-cmp v0.7.0 // indirect
37-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
36+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
3837
github.com/google/uuid v1.6.0 // indirect
3938
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4039
github.com/josharian/intern v1.0.0 // indirect
4140
github.com/json-iterator/go v1.1.12 // indirect
4241
github.com/mailru/easyjson v0.9.0 // indirect
4342
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
44-
github.com/modern-go/reflect2 v1.0.2 // indirect
43+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4544
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4645
github.com/pkg/errors v0.9.1 // indirect
46+
github.com/pmezard/go-difflib v1.0.0 // indirect
4747
github.com/prometheus/client_golang v1.22.0 // indirect
4848
github.com/prometheus/client_model v0.6.1 // indirect
4949
github.com/prometheus/common v0.62.0 // indirect
@@ -54,24 +54,24 @@ require (
5454
go.uber.org/zap v1.27.0 // indirect
5555
go.yaml.in/yaml/v2 v2.4.2 // indirect
5656
go.yaml.in/yaml/v3 v3.0.4 // indirect
57-
golang.org/x/mod v0.27.0 // indirect
58-
golang.org/x/net v0.43.0 // indirect
57+
golang.org/x/mod v0.32.0 // indirect
58+
golang.org/x/net v0.49.0 // indirect
5959
golang.org/x/oauth2 v0.27.0 // indirect
60-
golang.org/x/sync v0.16.0 // indirect
61-
golang.org/x/sys v0.35.0 // indirect
62-
golang.org/x/term v0.34.0 // indirect
63-
golang.org/x/text v0.28.0 // indirect
60+
golang.org/x/sync v0.19.0 // indirect
61+
golang.org/x/sys v0.40.0 // indirect
62+
golang.org/x/term v0.39.0 // indirect
63+
golang.org/x/text v0.33.0 // indirect
6464
golang.org/x/time v0.10.0 // indirect
65-
golang.org/x/tools v0.36.0 // indirect
65+
golang.org/x/tools v0.41.0 // indirect
6666
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
6767
google.golang.org/protobuf v1.36.7 // indirect
6868
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6969
gopkg.in/inf.v0 v0.9.1 // indirect
7070
gopkg.in/yaml.v3 v3.0.1 // indirect
71-
k8s.io/apiextensions-apiserver v0.33.7 // indirect
72-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
73-
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
71+
k8s.io/apiextensions-apiserver v0.34.1 // indirect
72+
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
73+
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
7474
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7575
sigs.k8s.io/randfill v1.0.0 // indirect
76-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
76+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
7777
)

0 commit comments

Comments
 (0)