Skip to content

Commit e5038e0

Browse files
zeroalphatzeroalphat
authored
Merge pull request #45 from cybozu-go/update-1.34
Update dependencies for Kubernetes 1.34
2 parents 6776e48 + 377dddd commit e5038e0

28 files changed

+389
-445
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
name: Build binaries
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- uses: actions/setup-go@v6
1414
with:
1515
go-version-file: "go.mod"
@@ -19,7 +19,7 @@ jobs:
1919
name: Small tests
2020
runs-on: ubuntu-24.04
2121
steps:
22-
- uses: actions/checkout@v5
22+
- uses: actions/checkout@v6
2323
- uses: actions/setup-go@v6
2424
with:
2525
go-version-file: "go.mod"
@@ -29,7 +29,7 @@ jobs:
2929
name: End-to-end tests
3030
runs-on: ubuntu-24.04
3131
steps:
32-
- uses: actions/checkout@v5
32+
- uses: actions/checkout@v6
3333
- uses: actions/setup-go@v6
3434
with:
3535
go-version-file: "go.mod"

‎.github/workflows/mdbook.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ jobs:
99
name: Build book
1010
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v5
12+
- uses: actions/checkout@v6
1313
- run: make book
14-
- uses: actions/upload-artifact@v5
14+
- uses: actions/upload-artifact@v6
1515
with:
1616
name: book
1717
path: docs/book
@@ -21,12 +21,12 @@ jobs:
2121
runs-on: ubuntu-24.04
2222
needs: build
2323
steps:
24-
- uses: actions/checkout@v5
24+
- uses: actions/checkout@v6
2525
with:
2626
ref: gh-pages
2727
# do not remove helm chart related files if present
2828
- run: ls | grep -v -E "index.yaml|.*\.tgz" | xargs rm -rf
29-
- uses: actions/download-artifact@v6
29+
- uses: actions/download-artifact@v7
3030
with:
3131
name: book
3232
- run: git add .

‎.github/workflows/release.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
contents: read
1212
packages: write
1313
steps:
14-
- uses: actions/checkout@v5
14+
- uses: actions/checkout@v6
1515
- name: Get version
1616
id: get_version
1717
run: |
@@ -50,7 +50,7 @@ jobs:
5050
permissions:
5151
contents: write
5252
steps:
53-
- uses: actions/checkout@v5
53+
- uses: actions/checkout@v6
5454
- name: Create Release
5555
env:
5656
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -68,7 +68,7 @@ jobs:
6868
if: contains(needs.release.result, 'success')
6969
steps:
7070
- name: Checkout
71-
uses: actions/checkout@v5
71+
uses: actions/checkout@v6
7272
with:
7373
fetch-depth: 0
7474
- name: Create release notes

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -145,15 +145,15 @@ KAPTEST ?= $(LOCALBIN)/kaptest
145145
YQ ?= $(LOCALBIN)/yq
146146

147147
## Tool Versions
148-
KUSTOMIZE_VERSION ?= v5.8.0
149-
CONTROLLER_TOOLS_VERSION ?= v0.19.0
150-
ENVTEST_VERSION ?= release-0.22
151-
GOLANGCI_LINT_VERSION ?= 2.6.2
152-
GINKGO_VERSION ?= v2.27.2
153-
CODE_GENERATOR_VERSION ?= v0.34.2
154-
MODELS_SCHEMA_VERSION ?= v1.34.2
148+
KUSTOMIZE_VERSION ?= v5.8.1
149+
CONTROLLER_TOOLS_VERSION ?= v0.20.0
150+
ENVTEST_VERSION ?= release-0.23
151+
GOLANGCI_LINT_VERSION ?= 2.9.0
152+
GINKGO_VERSION ?= v2.28.1
153+
CODE_GENERATOR_VERSION ?= v0.35.1
154+
MODELS_SCHEMA_VERSION ?= v1.35.1
155155
KAPTEST_VERSION ?= v0.1.2
156-
YQ_VERSION ?= v4.48.2
156+
YQ_VERSION ?= v4.52.2
157157

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

232232
# Tool versions
233-
MDBOOK_VERSION = 0.4.52
233+
MDBOOK_VERSION = 0.5.2
234234
MDBOOK := $(LOCALBIN)/mdbook
235235

236236
.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.19.0
6+
controller-gen.kubebuilder.io/version: v0.20.0
77
helm.sh/resource-policy: '{{ .Values.crds.keep | ternary "keep" "delete" }}'
88
labels:
99
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
@@ -233,7 +233,7 @@ apiVersion: apiextensions.k8s.io/v1
233233
kind: CustomResourceDefinition
234234
metadata:
235235
annotations:
236-
controller-gen.kubebuilder.io/version: v0.19.0
236+
controller-gen.kubebuilder.io/version: v0.20.0
237237
helm.sh/resource-policy: '{{ .Values.crds.keep | ternary "keep" "delete" }}'
238238
labels:
239239
app.kubernetes.io/managed-by: '{{ .Release.Service }}'

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -62,14 +62,6 @@ metadata:
6262
helm.sh/chart: '{{ include "ofen.chart" . }}'
6363
name: '{{ template "ofen.fullname" . }}-controller-manager-role'
6464
rules:
65-
- apiGroups:
66-
- ""
67-
resources:
68-
- events
69-
verbs:
70-
- create
71-
- patch
72-
- update
7365
- apiGroups:
7466
- ""
7567
resources:
@@ -79,6 +71,14 @@ rules:
7971
- get
8072
- list
8173
- watch
74+
- apiGroups:
75+
- events.k8s.io
76+
resources:
77+
- events
78+
verbs:
79+
- create
80+
- patch
81+
- update
8282
- apiGroups:
8383
- ofen.cybozu.io
8484
resources:

‎cmd/nodeimageset-controller/main.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ func main() {
130130
imagePuller,
131131
ctrl.Log.WithName("runner").WithValues("nodeName", nodeName),
132132
queue,
133-
mgr.GetEventRecorderFor("image-pull-runner"),
133+
mgr.GetEventRecorder("image-pull-runner"),
134134
)
135135
err = mgr.Add(runner)
136136
if err != nil {
@@ -157,7 +157,7 @@ func main() {
157157
Client: mgr.GetClient(),
158158
Scheme: mgr.GetScheme(),
159159
NodeName: nodeName,
160-
Recorder: mgr.GetEventRecorderFor("nodeimageset-controller"),
160+
Recorder: mgr.GetEventRecorder("nodeimageset-controller"),
161161
ContainerdClient: containerdClient,
162162
ImagePuller: imagePuller,
163163
Queue: queue,

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

‎config/rbac/role.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,6 @@ kind: ClusterRole
44
metadata:
55
name: controller-manager-role
66
rules:
7-
- apiGroups:
8-
- ""
9-
resources:
10-
- events
11-
verbs:
12-
- create
13-
- patch
14-
- update
157
- apiGroups:
168
- ""
179
resources:
@@ -21,6 +13,14 @@ rules:
2113
- get
2214
- list
2315
- watch
16+
- apiGroups:
17+
- events.k8s.io
18+
resources:
19+
- events
20+
verbs:
21+
- create
22+
- patch
23+
- update
2424
- apiGroups:
2525
- ofen.cybozu.io
2626
resources:

0 commit comments

Comments
 (0)