Skip to content

Commit 20ce6cc

Browse files
toshipptoshipp
authored
Merge pull request #1842 from cybozu/local-pv-provisioner/kubernetes-134
local-pv-provisioner: support Kubernetes 1.34
2 parents 2e21f5c + 83549d2 commit 20ce6cc

File tree

7 files changed

+223
-175
lines changed

7 files changed

+223
-175
lines changed

‎local-pv-provisioner/Makefile‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ IMAGE_VERSION = `cat ./TAG`
55
IMAGE_TAG = ghcr.io/cybozu/local-pv-provisioner:$(IMAGE_VERSION)
66
IMAGE_TAG_LATEST = ghcr.io/cybozu/local-pv-provisioner:latest
77

8-
CONTROLLER_TOOLS_VERSION = 0.18.0
9-
ENVTEST_K8S_VERSION = 1.33.0
8+
# https://github.com/kubernetes-sigs/controller-tools/releases
9+
CONTROLLER_TOOLS_VERSION = 0.19.0
10+
ENVTEST_K8S_VERSION = 1.34.0
1011
export ENVTEST_K8S_VERSION
1112

1213
# Specify envtest branch according to controller-runtime version

‎local-pv-provisioner/TAG‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
0.5.1
1+
0.5.2

‎local-pv-provisioner/e2etest/Makefile‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
KUBERNETES_VERSION := 1.33.1
1+
KUBERNETES_VERSION := 1.34.4
22
# https://github.com/kubernetes/minikube/releases
3-
MINIKUBE_VERSION := 1.36.0
3+
MINIKUBE_VERSION := 1.38.1
44

55
# Tools versions which are defined in go.mod
66
SELF_DIR := $(dir $(lastword $(MAKEFILE_LIST)))
@@ -33,7 +33,6 @@ setup:
3333
.PHONY: test
3434
test:
3535
$(MAKE) launch-cluster MINIKUBE_PROFILE=$(MINIKUBE_PROFILE)
36-
$(MAKE) setup-workaround-for-xfs
3736
$(MAKE) create-loop-dev
3837
$(MAKE) launch-local-pv-provisioner
3938
$(MAKE) do-test
@@ -74,18 +73,6 @@ launch-cluster:
7473
$(MINIKUBE) profile $(MINIKUBE_PROFILE)
7574
$(MAKE) image-build
7675

77-
# mkfs.xfs and the kernel on the minikube VM may be incompatible.
78-
# This workaround replaces mkfs.xfs to create compatible superblock with the kernel version.
79-
.PHONY: setup-workaround-for-xfs
80-
setup-workaround-for-xfs:
81-
@if ! $(MINIKUBE) ssh -- uname -r | grep -qF "5.10"; then \
82-
echo "the kernel version on minikube is not 5.10, it may not need workaround, please check it."; \
83-
exit 1; \
84-
fi
85-
$(MINIKUBE) ssh -- $(SUDO) sh -c '"[ -e /usr/sbin/mkfs.xfs.orig ] || mv /usr/sbin/mkfs.xfs /usr/sbin/mkfs.xfs.orig"'
86-
$(MINIKUBE) cp mkfs.xfs lpptest:/usr/sbin/mkfs.xfs
87-
$(MINIKUBE) ssh -- $(SUDO) chmod 0755 /usr/sbin/mkfs.xfs
88-
8976
.PHONY: create-loop-dev
9077
create-loop-dev:
9178
$(MINIKUBE) ssh -- $(DD) if=/dev/zero of=loop0.img bs=1G seek=1 count=0

‎local-pv-provisioner/e2etest/mkfs.xfs‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎local-pv-provisioner/go.mod‎

Lines changed: 60 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -5,80 +5,89 @@ go 1.24.0
55
toolchain go1.25.7
66

77
require (
8-
github.com/go-logr/logr v1.4.2
8+
github.com/go-logr/logr v1.4.3
99
github.com/google/go-cmp v0.7.0
10-
github.com/onsi/ginkgo/v2 v2.23.4
11-
github.com/onsi/gomega v1.37.0
10+
github.com/onsi/ginkgo/v2 v2.27.2
11+
github.com/onsi/gomega v1.38.2
1212
github.com/prometheus/client_golang v1.22.0
13-
github.com/spf13/cobra v1.9.1
14-
github.com/spf13/viper v1.20.1
15-
k8s.io/api v0.33.1
16-
k8s.io/apimachinery v0.33.1
17-
k8s.io/client-go v0.33.1
13+
github.com/spf13/cobra v1.10.2
14+
github.com/spf13/viper v1.21.0
15+
k8s.io/api v0.34.4
16+
k8s.io/apimachinery v0.34.4
17+
k8s.io/client-go v0.34.4
1818
k8s.io/klog/v2 v2.130.1
19-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
20-
sigs.k8s.io/controller-runtime v0.21.0
19+
k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
20+
sigs.k8s.io/controller-runtime v0.22.5
2121
)
2222

2323
require (
24+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2425
github.com/beorn7/perks v1.0.1 // indirect
25-
github.com/blang/semver/v4 v4.0.0 // indirect
2626
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2727
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
28+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2929
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
30-
github.com/fsnotify/fsnotify v1.8.0 // indirect
31-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
30+
github.com/fsnotify/fsnotify v1.9.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3232
github.com/go-logr/zapr v1.3.0 // indirect
33-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
34-
github.com/go-openapi/jsonreference v0.21.0 // indirect
35-
github.com/go-openapi/swag v0.23.0 // indirect
33+
github.com/go-openapi/jsonpointer v0.22.4 // indirect
34+
github.com/go-openapi/jsonreference v0.21.4 // indirect
35+
github.com/go-openapi/swag v0.25.4 // indirect
36+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
37+
github.com/go-openapi/swag/conv v0.25.4 // indirect
38+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
39+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
40+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
41+
github.com/go-openapi/swag/loading v0.25.4 // indirect
42+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
43+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
44+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
45+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
46+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
3647
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
37-
github.com/go-viper/mapstructure/v2 v2.2.1 // indirect
48+
github.com/go-viper/mapstructure/v2 v2.5.0 // indirect
3849
github.com/gogo/protobuf v1.3.2 // indirect
3950
github.com/google/btree v1.1.3 // indirect
40-
github.com/google/gnostic-models v0.6.9 // indirect
51+
github.com/google/gnostic-models v0.7.1 // indirect
4152
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4253
github.com/google/uuid v1.6.0 // indirect
4354
github.com/inconshreveable/mousetrap v1.1.0 // indirect
44-
github.com/josharian/intern v1.0.0 // indirect
4555
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.7.7 // indirect
4756
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
48-
github.com/modern-go/reflect2 v1.0.2 // indirect
57+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4958
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
50-
github.com/pelletier/go-toml/v2 v2.2.3 // indirect
51-
github.com/pkg/errors v0.9.1 // indirect
52-
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.62.0 // indirect
54-
github.com/prometheus/procfs v0.15.1 // indirect
55-
github.com/sagikazarmark/locafero v0.7.0 // indirect
56-
github.com/sourcegraph/conc v0.3.0 // indirect
57-
github.com/spf13/afero v1.12.0 // indirect
58-
github.com/spf13/cast v1.7.1 // indirect
59-
github.com/spf13/pflag v1.0.6 // indirect
59+
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
60+
github.com/pmezard/go-difflib v1.0.0 // indirect
61+
github.com/prometheus/client_model v0.6.2 // indirect
62+
github.com/prometheus/common v0.67.5 // indirect
63+
github.com/prometheus/procfs v0.19.2 // indirect
64+
github.com/sagikazarmark/locafero v0.12.0 // indirect
65+
github.com/spf13/afero v1.15.0 // indirect
66+
github.com/spf13/cast v1.10.0 // indirect
67+
github.com/spf13/pflag v1.0.10 // indirect
6068
github.com/subosito/gotenv v1.6.0 // indirect
6169
github.com/x448/float16 v0.8.4 // indirect
62-
go.uber.org/automaxprocs v1.6.0 // indirect
6370
go.uber.org/multierr v1.11.0 // indirect
64-
go.uber.org/zap v1.27.0 // indirect
65-
golang.org/x/net v0.38.0 // indirect
66-
golang.org/x/oauth2 v0.27.0 // indirect
67-
golang.org/x/sync v0.12.0 // indirect
68-
golang.org/x/sys v0.32.0 // indirect
69-
golang.org/x/term v0.30.0 // indirect
70-
golang.org/x/text v0.23.0 // indirect
71-
golang.org/x/time v0.9.0 // indirect
72-
golang.org/x/tools v0.31.0 // indirect
73-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
74-
google.golang.org/protobuf v1.36.5 // indirect
75-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
71+
go.uber.org/zap v1.27.1 // indirect
72+
go.yaml.in/yaml/v2 v2.4.3 // indirect
73+
go.yaml.in/yaml/v3 v3.0.4 // indirect
74+
golang.org/x/mod v0.32.0 // indirect
75+
golang.org/x/net v0.50.0 // indirect
76+
golang.org/x/oauth2 v0.35.0 // indirect
77+
golang.org/x/sync v0.19.0 // indirect
78+
golang.org/x/sys v0.41.0 // indirect
79+
golang.org/x/term v0.40.0 // indirect
80+
golang.org/x/text v0.34.0 // indirect
81+
golang.org/x/time v0.14.0 // indirect
82+
golang.org/x/tools v0.41.0 // indirect
83+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
84+
google.golang.org/protobuf v1.36.11 // indirect
85+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7686
gopkg.in/inf.v0 v0.9.1 // indirect
77-
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.33.0 // indirect
79-
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
80-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
87+
k8s.io/apiextensions-apiserver v0.34.4 // indirect
88+
k8s.io/kube-openapi v0.0.0-20260127142750-a19766b6e2d4 // indirect
89+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
8190
sigs.k8s.io/randfill v1.0.0 // indirect
82-
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
83-
sigs.k8s.io/yaml v1.4.0 // indirect
91+
sigs.k8s.io/structured-merge-diff/v6 v6.3.2 // indirect
92+
sigs.k8s.io/yaml v1.6.0 // indirect
8493
)

0 commit comments

Comments
 (0)