Skip to content

Commit 2af80b1

Browse files
peng225peng225
committed
local-pv-provisioner: support Kubernetes v1.32
Signed-off-by: Shinya Hayashi <shinya-hayashi@cybozu.co.jp>
1 parent 9e1a99f commit 2af80b1

File tree

4 files changed

+115
-115
lines changed

4 files changed

+115
-115
lines changed

‎local-pv-provisioner/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ 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.14.0
9-
ENVTEST_K8S_VERSION = 1.29.3
8+
CONTROLLER_TOOLS_VERSION = 0.17.2
9+
ENVTEST_K8S_VERSION = 1.32.0
1010

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

‎local-pv-provisioner/controllers/persistent_volume.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,9 +73,7 @@ func (r *PersistentVolumeReconciler) SetupWithManager(mgr ctrl.Manager, nodeName
7373
if err != nil {
7474
return err
7575
}
76-
src := source.Channel{
77-
Source: ch,
78-
}
76+
src := source.Channel(ch, &handler.EnqueueRequestForObject{})
7977

8078
pred := predicate.Funcs{
8179
CreateFunc: func(event.CreateEvent) bool { return true },
@@ -87,7 +85,7 @@ func (r *PersistentVolumeReconciler) SetupWithManager(mgr ctrl.Manager, nodeName
8785
return ctrl.NewControllerManagedBy(mgr).
8886
For(&corev1.PersistentVolume{}).
8987
WithEventFilter(pred).
90-
WatchesRawSource(&src, &handler.EnqueueRequestForObject{}).
88+
WatchesRawSource(src).
9189
Complete(r)
9290
}
9391

‎local-pv-provisioner/go.mod

Lines changed: 36 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,43 @@
11
module github.com/cybozu/neco-containers/local-pv-provisioner
22

3-
go 1.22
3+
go 1.23.0
44

55
require (
66
github.com/go-logr/logr v1.4.2
7-
github.com/google/go-cmp v0.6.0
8-
github.com/onsi/ginkgo/v2 v2.19.0
9-
github.com/onsi/gomega v1.33.1
7+
github.com/google/go-cmp v0.7.0
8+
github.com/onsi/ginkgo/v2 v2.22.2
9+
github.com/onsi/gomega v1.36.2
1010
github.com/prometheus/client_golang v1.19.1
11-
github.com/spf13/cobra v1.8.0
12-
github.com/spf13/viper v1.18.2
13-
k8s.io/api v0.29.5
14-
k8s.io/apimachinery v0.29.5
15-
k8s.io/client-go v0.29.5
16-
k8s.io/klog/v2 v2.120.1
17-
sigs.k8s.io/controller-runtime v0.17.5
11+
github.com/spf13/cobra v1.9.1
12+
github.com/spf13/viper v1.19.0
13+
k8s.io/api v0.32.2
14+
k8s.io/apimachinery v0.32.2
15+
k8s.io/client-go v0.32.2
16+
k8s.io/klog/v2 v2.130.1
17+
sigs.k8s.io/controller-runtime v0.20.2
1818
)
1919

2020
require (
2121
github.com/beorn7/perks v1.0.1 // indirect
2222
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2323
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2424
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
25-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
25+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2626
github.com/fsnotify/fsnotify v1.7.0 // indirect
27+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
2728
github.com/go-logr/zapr v1.3.0 // indirect
2829
github.com/go-openapi/jsonpointer v0.21.0 // indirect
2930
github.com/go-openapi/jsonreference v0.21.0 // indirect
3031
github.com/go-openapi/swag v0.23.0 // indirect
3132
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3233
github.com/gogo/protobuf v1.3.2 // indirect
33-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3434
github.com/golang/protobuf v1.5.4 // indirect
35+
github.com/google/btree v1.1.3 // indirect
3536
github.com/google/gnostic-models v0.6.8 // indirect
3637
github.com/google/gofuzz v1.2.0 // indirect
37-
github.com/google/pprof v0.0.0-20240528025155-186aa0362fba // indirect
38+
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
3839
github.com/google/uuid v1.6.0 // indirect
3940
github.com/hashicorp/hcl v1.0.0 // indirect
40-
github.com/imdario/mergo v0.3.16 // indirect
4141
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4242
github.com/josharian/intern v1.0.0 // indirect
4343
github.com/json-iterator/go v1.1.12 // indirect
@@ -50,36 +50,37 @@ require (
5050
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
5151
github.com/pkg/errors v0.9.1 // indirect
5252
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.53.0 // indirect
54-
github.com/prometheus/procfs v0.15.0 // indirect
53+
github.com/prometheus/common v0.55.0 // indirect
54+
github.com/prometheus/procfs v0.15.1 // indirect
5555
github.com/sagikazarmark/locafero v0.4.0 // indirect
5656
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
5757
github.com/sourcegraph/conc v0.3.0 // indirect
5858
github.com/spf13/afero v1.11.0 // indirect
5959
github.com/spf13/cast v1.6.0 // indirect
60-
github.com/spf13/pflag v1.0.5 // indirect
60+
github.com/spf13/pflag v1.0.6 // indirect
6161
github.com/subosito/gotenv v1.6.0 // indirect
62+
github.com/x448/float16 v0.8.4 // indirect
6263
go.uber.org/multierr v1.11.0 // indirect
63-
go.uber.org/zap v1.26.0 // indirect
64-
golang.org/x/exp v0.0.0-20240530194437-404ba88c7ed0 // indirect
65-
golang.org/x/net v0.25.0 // indirect
66-
golang.org/x/oauth2 v0.20.0 // indirect
67-
golang.org/x/sys v0.20.0 // indirect
68-
golang.org/x/term v0.20.0 // indirect
69-
golang.org/x/text v0.15.0 // indirect
70-
golang.org/x/time v0.5.0 // indirect
71-
golang.org/x/tools v0.21.0 // indirect
64+
go.uber.org/zap v1.27.0 // indirect
65+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
66+
golang.org/x/net v0.33.0 // indirect
67+
golang.org/x/oauth2 v0.23.0 // indirect
68+
golang.org/x/sync v0.10.0 // indirect
69+
golang.org/x/sys v0.28.0 // indirect
70+
golang.org/x/term v0.27.0 // indirect
71+
golang.org/x/text v0.21.0 // indirect
72+
golang.org/x/time v0.7.0 // indirect
73+
golang.org/x/tools v0.28.0 // indirect
7274
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
73-
google.golang.org/protobuf v1.34.1 // indirect
75+
google.golang.org/protobuf v1.36.1 // indirect
76+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7477
gopkg.in/inf.v0 v0.9.1 // indirect
7578
gopkg.in/ini.v1 v1.67.0 // indirect
76-
gopkg.in/yaml.v2 v2.4.0 // indirect
7779
gopkg.in/yaml.v3 v3.0.1 // indirect
78-
k8s.io/apiextensions-apiserver v0.29.5 // indirect
79-
k8s.io/component-base v0.29.5 // indirect
80-
k8s.io/kube-openapi v0.0.0-20240521193020-835d969ad83a // indirect
81-
k8s.io/utils v0.0.0-20240502163921-fe8a2dddb1d0 // indirect
82-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
83-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
80+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
81+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
82+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
83+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
84+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
8485
sigs.k8s.io/yaml v1.4.0 // indirect
8586
)

0 commit comments

Comments
 (0)