Skip to content

Commit d9c77b2

Browse files
tknatkna
authored
Merge pull request #56 from cybozu-go/regular-update-1.33
Support k8s 1.33
2 parents 4d6af98 + a151b84 commit d9c77b2

File tree

14 files changed

+224
-182
lines changed

14 files changed

+224
-182
lines changed

‎.github/workflows/ci.yaml‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -9,47 +9,47 @@ on:
99
jobs:
1010
build:
1111
name: Build
12-
runs-on: ubuntu-22.04
12+
runs-on: ubuntu-24.04
1313
steps:
14-
- uses: actions/checkout@v4
14+
- uses: actions/checkout@v6
1515
- name: Setup go
16-
uses: actions/setup-go@v5
16+
uses: actions/setup-go@v6
1717
with:
1818
go-version-file: go.mod
1919
- name: Test
2020
run: make build
2121
lint:
2222
name: Lint
23-
runs-on: ubuntu-22.04
23+
runs-on: ubuntu-24.04
2424
steps:
25-
- uses: actions/checkout@v4
26-
- uses: actions/setup-python@v5
25+
- uses: actions/checkout@v6
26+
- uses: actions/setup-python@v6
2727
- name: Setup go
28-
uses: actions/setup-go@v5
28+
uses: actions/setup-go@v6
2929
with:
3030
go-version-file: go.mod
3131
- name: Lint
3232
run: make lint
3333
check-goreleaser-config:
3434
name: Check goreleaser.yml
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
steps:
37-
- uses: actions/checkout@v4
37+
- uses: actions/checkout@v6
3838
- name: Setup go
39-
uses: actions/setup-go@v5
39+
uses: actions/setup-go@v6
4040
with:
4141
go-version-file: go.mod
42-
- uses: goreleaser/goreleaser-action@v6.3.0
42+
- uses: goreleaser/goreleaser-action@v6.4.0
4343
with:
44-
version: v2.9.0
44+
version: v2.13.3
4545
args: check -f .goreleaser.yml
4646
test:
4747
name: Test
48-
runs-on: ubuntu-22.04
48+
runs-on: ubuntu-24.04
4949
steps:
50-
- uses: actions/checkout@v4
50+
- uses: actions/checkout@v6
5151
- name: Setup go
52-
uses: actions/setup-go@v5
52+
uses: actions/setup-go@v6
5353
with:
5454
go-version-file: go.mod
5555
- name: Test
@@ -58,11 +58,11 @@ jobs:
5858
name: End-to-End Tests
5959
strategy:
6060
matrix:
61-
k8s-version: ["1.30.13", "1.31.9", "1.32.5"]
62-
runs-on: ubuntu-22.04
61+
k8s-version: ["1.31.14", "1.32.11", "1.33.7"]
62+
runs-on: ubuntu-24.04
6363
steps:
64-
- uses: actions/checkout@v4
65-
- uses: actions/setup-go@v5
64+
- uses: actions/checkout@v6
65+
- uses: actions/setup-go@v6
6666
with:
6767
go-version-file: go.mod
6868
- run: make start KUBERNETES_VERSION=${{ matrix.k8s-version }}
@@ -72,32 +72,32 @@ jobs:
7272
- run: make logs
7373
working-directory: e2e
7474
if: always()
75-
- uses: actions/upload-artifact@v4
75+
- uses: actions/upload-artifact@v6
7676
if: always()
7777
with:
7878
name: logs-${{ matrix.k8s-version }}.tar.gz
7979
path: e2e/logs.tar.gz
8080
dry-run:
8181
name: Dry-run release
82-
runs-on: ubuntu-22.04
82+
runs-on: ubuntu-24.04
8383
steps:
8484
- name: Checkout
85-
uses: actions/checkout@v4
85+
uses: actions/checkout@v6
8686
with:
8787
fetch-depth: 0
8888
- uses: docker/setup-qemu-action@v3
8989
- uses: docker/setup-buildx-action@v3
9090
- name: Setup go
91-
uses: actions/setup-go@v5
91+
uses: actions/setup-go@v6
9292
with:
9393
go-version-file: go.mod
9494
- name: Setup tag for goreleaser
9595
run: |
9696
echo "GORELEASER_CURRENT_TAG=$(git describe --tags --abbrev=0 --match "v*" || echo v0.0.0)" >> $GITHUB_ENV
9797
- name: GoReleaser
98-
uses: goreleaser/goreleaser-action@v6.3.0
98+
uses: goreleaser/goreleaser-action@v6.4.0
9999
with:
100-
version: v2.9.0
100+
version: v2.13.3
101101
args: --snapshot --skip publish --clean
102102
- name: Test built containers
103103
run: make container-structure-test

‎.github/workflows/helm-release.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,16 @@ on:
55
- 'chart-v*'
66
jobs:
77
build:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414
- name: Set up Helm
1515
uses: azure/setup-helm@v4
1616
with:
17-
version: v3.18.2
17+
version: v4.0.4
1818
- name: Check chart version
1919
run: |
2020
tag_version=${GITHUB_REF##*/chart-v}
@@ -25,24 +25,24 @@ jobs:
2525
fi
2626
- name: Packaging the chart
2727
run: helm package ./charts/tenet/
28-
- uses: actions/upload-artifact@v4
28+
- uses: actions/upload-artifact@v6
2929
with:
3030
name: helm-charts
3131
path: ./tenet-*.tgz
3232
retention-days: 1
3333
publish:
3434
name: Publish charts on GitHub Pages
35-
runs-on: ubuntu-22.04
35+
runs-on: ubuntu-24.04
3636
needs: build
3737
steps:
38-
- uses: actions/checkout@v4
38+
- uses: actions/checkout@v6
3939
with:
4040
ref: gh-pages
4141
- name: Set up Helm
4242
uses: azure/setup-helm@v4
4343
with:
44-
version: v3.18.2
45-
- uses: actions/download-artifact@v4
44+
version: v4.0.4
45+
- uses: actions/download-artifact@v7
4646
with:
4747
name: helm-charts
4848
- name: Update charts index

‎.github/workflows/helm.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@ on:
66
- '!**.md'
77
jobs:
88
lint-test:
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
1111
- name: Checkout
12-
uses: actions/checkout@v4
12+
uses: actions/checkout@v6
1313
with:
1414
fetch-depth: 0
15-
- uses: actions/setup-python@v5
15+
- uses: actions/setup-python@v6
1616
- name: Set up chart-testing
17-
uses: helm/chart-testing-action@cf48dbf901ed202ae2c5aee26422dd6dfdf41e47 # 2.7.0
17+
uses: helm/chart-testing-action@6ec842c01de15ebb84c8627d2744a0c2f2755c9f # 2.8.0
1818
- name: Run chart-testing (list-changed)
1919
id: list-changed
2020
run: |
@@ -25,11 +25,11 @@ jobs:
2525
- name: Run chart-testing (lint)
2626
run: ct lint --config ct.yaml
2727
- name: Create kind cluster
28-
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # 1.12.0
28+
uses: helm/kind-action@92086f6be054225fa813e0a4b13787fc9088faab # 1.13.0
2929
if: steps.list-changed.outputs.changed == 'true'
3030
with:
31-
node_image: kindest/node:v1.27.3
32-
version: v0.29.0
31+
node_image: kindest/node:v1.33.7
32+
version: v0.31.0
3333
- name: Apply cert-manager
3434
run: |
3535
kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml

‎.github/workflows/mdbook.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,26 @@ on:
77
jobs:
88
build:
99
name: Build book
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v6
1313
- run: make book
14-
- uses: actions/upload-artifact@v4
14+
- uses: actions/upload-artifact@v6
1515
with:
1616
name: book
1717
path: docs/book
1818
retention-days: 1
1919
publish:
2020
name: Publish book on GitHub Pages
21-
runs-on: ubuntu-22.04
21+
runs-on: ubuntu-24.04
2222
needs: build
2323
steps:
24-
- uses: actions/checkout@v4
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@v4
29+
- uses: actions/download-artifact@v7
3030
with:
3131
name: book
3232
- run: git add .

‎.github/workflows/release.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ on:
55
- 'v*'
66
jobs:
77
release:
8-
runs-on: ubuntu-22.04
8+
runs-on: ubuntu-24.04
99
steps:
1010
- name: Checkout
11-
uses: actions/checkout@v4
11+
uses: actions/checkout@v6
1212
with:
1313
fetch-depth: 0
1414
- uses: docker/setup-qemu-action@v3
@@ -20,13 +20,13 @@ jobs:
2020
username: ${{ github.repository_owner }}
2121
password: ${{ secrets.GITHUB_TOKEN }}
2222
- name: Setup go
23-
uses: actions/setup-go@v5
23+
uses: actions/setup-go@v6
2424
with:
2525
go-version-file: go.mod
2626
- name: GoReleaser
27-
uses: goreleaser/goreleaser-action@v6.3.0
27+
uses: goreleaser/goreleaser-action@v6.4.0
2828
with:
29-
version: v2.9.0
29+
version: v2.13.3
3030
args: release --clean
3131
env:
3232
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎.golangci.yml‎

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,31 @@
1+
version: "2"
12
linters:
23
enable:
34
- dupl
45
- gocognit
56
- goconst
67
- gocyclo
78
- godot
8-
- gofmt
99
- nilerr
1010
- revive
1111
- unparam
12-
run:
13-
timeout: 5m
12+
exclusions:
13+
generated: lax
14+
presets:
15+
- comments
16+
- common-false-positives
17+
- legacy
18+
- std-error-handling
19+
paths:
20+
- third_party$
21+
- builtin$
22+
- examples$
23+
formatters:
24+
enable:
25+
- gofmt
26+
exclusions:
27+
generated: lax
28+
paths:
29+
- third_party$
30+
- builtin$
31+
- examples$

‎.pre-commit-config.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
default_stages: [commit]
22
repos:
33
- repo: https://github.com/golangci/golangci-lint
4-
rev: v1.63.4
4+
rev: v2.8.0
55
hooks:
66
- id: golangci-lint
77
- repo: https://github.com/pre-commit/pre-commit-hooks
8-
rev: v5.0.0
8+
rev: v6.0.0
99
hooks:
1010
- id: check-merge-conflict
1111
- id: check-toml

‎Makefile.versions‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
1-
ACTIONS_CHECKOUT_VERSION := 4
2-
ACTIONS_DOWNLOAD_ARTIFACT_VERSION := 4
3-
ACTIONS_SETUP_GO_VERSION := 5
4-
ACTIONS_SETUP_PYTHON_VERSION := 5
5-
ACTIONS_UPLOAD_ARTIFACT_VERSION := 4
1+
ACTIONS_CHECKOUT_VERSION := 6
2+
ACTIONS_DOWNLOAD_ARTIFACT_VERSION := 7
3+
ACTIONS_SETUP_GO_VERSION := 6
4+
ACTIONS_SETUP_PYTHON_VERSION := 6
5+
ACTIONS_UPLOAD_ARTIFACT_VERSION := 6
66
AZURE_SETUP_HELM_VERSION := 4
7-
CILIUM_VERSION := 1.15.13
8-
CERT_MANAGER_VERSION := 1.17.1
9-
CST_VERSION := 1.19.3
10-
CTRL_TOOLS_VERSION := 0.17.3
7+
CILIUM_VERSION := 1.16.12
8+
CERT_MANAGER_VERSION := 1.19.1
9+
CST_VERSION := 1.22.1
10+
CTRL_TOOLS_VERSION := 0.18.0
1111
DOCKER_LOGIN_VERSION := 3
1212
DOCKER_SETUP_BUILDX_VERSION := 3
1313
DOCKER_SETUP_QEMU_VERSION := 3
1414
GH_VERSION := 2.34.0
15-
GORELEASER_VERSION := 2.9.0
16-
GORELEASER_ACTION_VERSION := 6.3.0
17-
HELM_CHART_TESTING_VESRION := 2.7.0
18-
HELM_CHART_TESTING_HASH := cf48dbf901ed202ae2c5aee26422dd6dfdf41e47
19-
HELM_KIND_VERSION := 1.12.0
20-
HELM_KIND_HASH := a1b0e391336a6ee6713a0583f8c6240d70863de3
21-
HELM_VERSION := 3.18.2
22-
KIND_VERSION := 0.29.0
23-
KUBERNETES_VERSION := 1.32.5
24-
KUSTOMIZE_VERSION := 5.4.3
25-
MDBOOK_VERSION := 0.4.51
15+
GORELEASER_VERSION := 2.13.3
16+
GORELEASER_ACTION_VERSION := 6.4.0
17+
HELM_CHART_TESTING_VESRION := 2.8.0
18+
HELM_CHART_TESTING_HASH := 6ec842c01de15ebb84c8627d2744a0c2f2755c9f
19+
HELM_KIND_VERSION := 1.13.0
20+
HELM_KIND_HASH := 92086f6be054225fa813e0a4b13787fc9088faab
21+
HELM_VERSION := 4.0.4
22+
KIND_VERSION := 0.31.0
23+
KUBERNETES_VERSION := 1.33.7
24+
KUSTOMIZE_VERSION := 5.6.0
25+
MDBOOK_VERSION := 0.5.2
2626
YQ_VERSION := 4.45.4

‎charts/tenet/templates/generated/crds/tenet.cybozu.io_crds.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ metadata:
44
annotations:
55
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
66
. }}-serving-cert'
7-
controller-gen.kubebuilder.io/version: v0.17.3
7+
controller-gen.kubebuilder.io/version: v0.18.0
88
labels:
99
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
1010
app.kubernetes.io/name: '{{ include "tenet.name" . }}'
@@ -163,7 +163,7 @@ metadata:
163163
annotations:
164164
cert-manager.io/inject-ca-from: '{{ .Release.Namespace }}/{{ template "tenet.fullname"
165165
. }}-serving-cert'
166-
controller-gen.kubebuilder.io/version: v0.17.3
166+
controller-gen.kubebuilder.io/version: v0.18.0
167167
labels:
168168
app.kubernetes.io/managed-by: '{{ .Release.Service }}'
169169
app.kubernetes.io/name: '{{ include "tenet.name" . }}'

‎config/crd/bases/tenet.cybozu.io_networkpolicyadmissionrules.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.17.3
6+
controller-gen.kubebuilder.io/version: v0.18.0
77
name: networkpolicyadmissionrules.tenet.cybozu.io
88
spec:
99
group: tenet.cybozu.io

0 commit comments

Comments
 (0)