Skip to content

Commit 4f53aed

Browse files
hanapediahanapedia
authored
Merge pull request #127 from cybozu-go/update-dependencies-202511
chore: update dependencies for 2025/11 regular update
2 parents 50a877b + eec4673 commit 4f53aed

6 files changed

Lines changed: 180 additions & 153 deletions

File tree

‎.github/workflows/main.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ jobs:
99
name: Build image
1010
runs-on: ubuntu-22.04
1111
steps:
12-
- uses: actions/checkout@v4
13-
- uses: actions/setup-go@v5
12+
- uses: actions/checkout@v6
13+
- uses: actions/setup-go@v6
1414
with:
1515
go-version-file: 'go.mod'
1616
- run: make setup

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ jobs:
88
name: Push container image
99
runs-on: ubuntu-22.04
1010
steps:
11-
- uses: actions/checkout@v4
12-
- uses: actions/setup-go@v5
11+
- uses: actions/checkout@v6
12+
- uses: actions/setup-go@v6
1313
with:
1414
go-version-file: 'go.mod'
1515
- run: make setup
@@ -36,7 +36,7 @@ jobs:
3636
needs: image
3737
runs-on: ubuntu-22.04
3838
steps:
39-
- uses: actions/checkout@v4
39+
- uses: actions/checkout@v6
4040
- name: Create release
4141
id: create_release
4242
uses: actions/create-release@v1

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
include Makefile.versions
22

3-
CONTROLLER_TOOLS_VERSION = 0.18.0
3+
CONTROLLER_TOOLS_VERSION = 0.19.0
44

55
PROJECT_DIR := $(CURDIR)
66
BIN_DIR := $(PROJECT_DIR)/bin

‎Makefile.versions‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
ACTIONS_CHECKOUT_VERSION := 4
1+
ACTIONS_CHECKOUT_VERSION := 6
22
ACTIONS_CREATE_RELEASE_VERSION := 1
3-
ACTIONS_SETUP_GO_VERSION := 5
4-
CERT_MANAGER_VERSION := 1.18.2
5-
CONTOUR_VERSION := 1.32.0
6-
ENVTEST_K8S_VERSION := 1.33.0
7-
EXTERNAL_DNS_VERSION := 0.18.0
3+
ACTIONS_SETUP_GO_VERSION := 6
4+
CERT_MANAGER_VERSION := 1.19.1
5+
CONTOUR_VERSION := 1.33.0
6+
ENVTEST_K8S_VERSION := 1.34.1
7+
EXTERNAL_DNS_VERSION := 0.20.0
88
GH_VERSION := 2.68.1
99
YQ_VERSION := 4.45.1
1010

1111
# Follow the kustomize version installed in the Argo CD container
1212
# https://github.com/cybozu/neco-containers/blob/main/argocd/Dockerfile#L10
13-
KUSTOMIZE_VERSION := 5.4.3
13+
KUSTOMIZE_VERSION := 5.6.0

‎go.mod‎

Lines changed: 54 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,85 +1,92 @@
11
module github.com/cybozu-go/contour-plus
22

3-
go 1.24.5
3+
go 1.25.4
44

55
require (
66
github.com/go-logr/logr v1.4.3
7-
github.com/onsi/ginkgo/v2 v2.23.4
8-
github.com/onsi/gomega v1.37.0
9-
github.com/projectcontour/contour v1.32.0
10-
github.com/spf13/cobra v1.9.1
11-
github.com/spf13/pflag v1.0.7
12-
github.com/spf13/viper v1.20.1
13-
k8s.io/api v0.33.3
14-
k8s.io/apimachinery v0.33.3
15-
k8s.io/client-go v0.33.3
7+
github.com/onsi/ginkgo/v2 v2.25.3
8+
github.com/onsi/gomega v1.38.2
9+
github.com/projectcontour/contour v1.33.0
10+
github.com/spf13/cobra v1.10.2
11+
github.com/spf13/pflag v1.0.10
12+
github.com/spf13/viper v1.21.0
13+
k8s.io/api v0.34.2
14+
k8s.io/apimachinery v0.34.2
15+
k8s.io/client-go v0.34.2
1616
k8s.io/klog/v2 v2.130.1
17-
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
18-
sigs.k8s.io/controller-runtime v0.21.0
17+
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4
18+
sigs.k8s.io/controller-runtime v0.22.4
1919
)
2020

2121
require (
22+
github.com/Masterminds/semver/v3 v3.4.0 // indirect
2223
github.com/beorn7/perks v1.0.1 // indirect
23-
github.com/blang/semver/v4 v4.0.0 // indirect
2424
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2525
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
26-
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
26+
github.com/emicklei/go-restful/v3 v3.13.0 // indirect
2727
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
2828
github.com/fsnotify/fsnotify v1.9.0 // indirect
2929
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
3030
github.com/go-logr/zapr v1.3.0 // indirect
31-
github.com/go-openapi/jsonpointer v0.21.1 // indirect
32-
github.com/go-openapi/jsonreference v0.21.0 // indirect
33-
github.com/go-openapi/swag v0.23.1 // indirect
31+
github.com/go-openapi/jsonpointer v0.22.3 // indirect
32+
github.com/go-openapi/jsonreference v0.21.3 // indirect
33+
github.com/go-openapi/swag v0.25.4 // indirect
34+
github.com/go-openapi/swag/cmdutils v0.25.4 // indirect
35+
github.com/go-openapi/swag/conv v0.25.4 // indirect
36+
github.com/go-openapi/swag/fileutils v0.25.4 // indirect
37+
github.com/go-openapi/swag/jsonname v0.25.4 // indirect
38+
github.com/go-openapi/swag/jsonutils v0.25.4 // indirect
39+
github.com/go-openapi/swag/loading v0.25.4 // indirect
40+
github.com/go-openapi/swag/mangling v0.25.4 // indirect
41+
github.com/go-openapi/swag/netutils v0.25.4 // indirect
42+
github.com/go-openapi/swag/stringutils v0.25.4 // indirect
43+
github.com/go-openapi/swag/typeutils v0.25.4 // indirect
44+
github.com/go-openapi/swag/yamlutils v0.25.4 // indirect
3445
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3546
github.com/go-viper/mapstructure/v2 v2.4.0 // indirect
3647
github.com/gogo/protobuf v1.3.2 // indirect
3748
github.com/google/btree v1.1.3 // indirect
38-
github.com/google/gnostic-models v0.7.0 // indirect
49+
github.com/google/gnostic-models v0.7.1 // indirect
3950
github.com/google/go-cmp v0.7.0 // indirect
4051
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4152
github.com/google/uuid v1.6.0 // indirect
4253
github.com/inconshreveable/mousetrap v1.1.0 // indirect
43-
github.com/josharian/intern v1.0.0 // indirect
4454
github.com/json-iterator/go v1.1.12 // indirect
45-
github.com/mailru/easyjson v0.9.0 // indirect
4655
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
47-
github.com/modern-go/reflect2 v1.0.2 // indirect
56+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
4857
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4958
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
50-
github.com/pkg/errors v0.9.1 // indirect
51-
github.com/prometheus/client_golang v1.22.0 // indirect
59+
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
60+
github.com/prometheus/client_golang v1.23.2 // indirect
5261
github.com/prometheus/client_model v0.6.2 // indirect
53-
github.com/prometheus/common v0.65.0 // indirect
54-
github.com/prometheus/procfs v0.17.0 // indirect
55-
github.com/sagikazarmark/locafero v0.9.0 // indirect
56-
github.com/sourcegraph/conc v0.3.0 // indirect
57-
github.com/spf13/afero v1.14.0 // indirect
58-
github.com/spf13/cast v1.9.2 // indirect
62+
github.com/prometheus/common v0.67.4 // 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
5967
github.com/subosito/gotenv v1.6.0 // indirect
6068
github.com/x448/float16 v0.8.4 // indirect
6169
go.uber.org/automaxprocs v1.6.0 // indirect
6270
go.uber.org/multierr v1.11.0 // indirect
63-
go.uber.org/zap v1.27.0 // indirect
64-
go.yaml.in/yaml/v2 v2.4.2 // indirect
71+
go.uber.org/zap v1.27.1 // indirect
72+
go.yaml.in/yaml/v2 v2.4.3 // indirect
6573
go.yaml.in/yaml/v3 v3.0.4 // indirect
66-
golang.org/x/net v0.42.0 // indirect
67-
golang.org/x/oauth2 v0.30.0 // indirect
68-
golang.org/x/sync v0.16.0 // indirect
69-
golang.org/x/sys v0.34.0 // indirect
70-
golang.org/x/term v0.33.0 // indirect
71-
golang.org/x/text v0.27.0 // indirect
72-
golang.org/x/time v0.12.0 // indirect
73-
golang.org/x/tools v0.34.0 // indirect
74+
golang.org/x/net v0.47.0 // indirect
75+
golang.org/x/oauth2 v0.33.0 // indirect
76+
golang.org/x/sync v0.18.0 // indirect
77+
golang.org/x/sys v0.38.0 // indirect
78+
golang.org/x/term v0.37.0 // indirect
79+
golang.org/x/text v0.31.0 // indirect
80+
golang.org/x/time v0.14.0 // indirect
81+
golang.org/x/tools v0.38.0 // indirect
7482
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
75-
google.golang.org/protobuf v1.36.6 // indirect
76-
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
83+
google.golang.org/protobuf v1.36.10 // indirect
84+
gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
7785
gopkg.in/inf.v0 v0.9.1 // indirect
78-
gopkg.in/yaml.v3 v3.0.1 // indirect
79-
k8s.io/apiextensions-apiserver v0.33.3 // indirect
80-
k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e // indirect
81-
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
86+
k8s.io/apiextensions-apiserver v0.34.2 // indirect
87+
k8s.io/kube-openapi v0.0.0-20251125145642-4e65d59e963e // indirect
88+
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
8289
sigs.k8s.io/randfill v1.0.0 // indirect
83-
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
84-
sigs.k8s.io/yaml v1.5.0 // indirect
90+
sigs.k8s.io/structured-merge-diff/v6 v6.3.1 // indirect
91+
sigs.k8s.io/yaml v1.6.0 // indirect
8592
)

0 commit comments

Comments
 (0)