Skip to content

Commit aebac98

Browse files
authored
Merge pull request #152 from cybozu-go/container-updates
Bump Kubernetes version to v1.31 and update related dependencies
2 parents 920dff4 + 58abee4 commit aebac98

File tree

19 files changed

+270
-354
lines changed

19 files changed

+270
-354
lines changed

.github/actions/aqua/action.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ inputs:
77
runs:
88
using: composite
99
steps:
10-
- uses: aquaproj/aqua-installer@4551ec64e21bf0f557c2525135ff0bd2cba40ec7 # v3.0.0
10+
- uses: aquaproj/aqua-installer@e2d0136abcf70b7a2f6f505720640750557c4b33 # v3.1.1
1111
with:
12-
aqua_version: v2.27.3
12+
aqua_version: v2.44.1
1313
policy_allow: "true"
1414
env:
1515
GITHUB_TOKEN: ${{ inputs.github_token }}

.github/workflows/ci.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ on:
77
jobs:
88
build:
99
name: Build binaries
10-
runs-on: ubuntu-22.04
10+
runs-on: ubuntu-24.04
1111
steps:
12-
- uses: actions/checkout@v3
13-
- uses: actions/setup-go@v3
12+
- uses: actions/checkout@v4
13+
- uses: actions/setup-go@v5
1414
with:
1515
go-version-file: go.mod
1616
- uses: ./.github/actions/aqua
@@ -19,10 +19,10 @@ jobs:
1919
- run: make release-build
2020
test:
2121
name: Small tests
22-
runs-on: ubuntu-22.04
22+
runs-on: ubuntu-24.04
2323
steps:
24-
- uses: actions/checkout@v3
25-
- uses: actions/setup-go@v3
24+
- uses: actions/checkout@v4
25+
- uses: actions/setup-go@v5
2626
with:
2727
go-version-file: go.mod
2828
- uses: ./.github/actions/aqua
@@ -36,13 +36,13 @@ jobs:
3636
strategy:
3737
matrix:
3838
k8s-version:
39-
- v1.28.7 # renovate: kindest/node
40-
- v1.29.2 # renovate: kindest/node
41-
- v1.30.0 # renovate: kindest/node
42-
runs-on: ubuntu-22.04
39+
- v1.29.12 # renovate: kindest/node
40+
- v1.30.8 # renovate: kindest/node
41+
- v1.31.4 # renovate: kindest/node
42+
runs-on: ubuntu-24.04
4343
steps:
44-
- uses: actions/checkout@v3
45-
- uses: actions/setup-go@v3
44+
- uses: actions/checkout@v4
45+
- uses: actions/setup-go@v5
4646
with:
4747
go-version-file: go.mod
4848
cache: true

.github/workflows/helm.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ on:
88

99
jobs:
1010
lint-test:
11-
runs-on: ubuntu-22.04
11+
runs-on: ubuntu-24.04
1212

1313
steps:
1414
- name: Checkout
15-
uses: actions/checkout@v3
15+
uses: actions/checkout@v4
1616
with:
1717
fetch-depth: 0
18-
- uses: actions/setup-python@v4
18+
- uses: actions/setup-python@v5
1919
with:
20-
python-version: 3.7
20+
python-version: 3.13
2121
- name: Set up chart-testing
22-
uses: helm/chart-testing-action@v2.2.1
22+
uses: helm/chart-testing-action@0d28d3144d3a25ea2cc349d6e59901c4ff469b3b # v2.7.0
2323

2424
- name: Run chart-testing (list-changed)
2525
id: list-changed
@@ -33,10 +33,10 @@ jobs:
3333
run: ct lint --config ct.yaml
3434

3535
- name: Create kind cluster
36-
uses: helm/kind-action@v1.10.0
36+
uses: helm/kind-action@a1b0e391336a6ee6713a0583f8c6240d70863de3 # v1.12.0
3737
if: steps.list-changed.outputs.changed == 'true'
3838
with:
39-
node_image: kindest/node:v1.30.0
39+
node_image: kindest/node:v1.31.4
4040
- name: Apply cert-manager
4141
run: |
4242
kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml

.github/workflows/mdbook.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ 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@v3
12+
- uses: actions/checkout@v4
1313
- uses: ./.github/actions/aqua
1414
with:
1515
github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -21,10 +21,10 @@ jobs:
2121
retention-days: 1
2222
publish:
2323
name: Publish book on GitHub Pages
24-
runs-on: ubuntu-22.04
24+
runs-on: ubuntu-24.04
2525
needs: build
2626
steps:
27-
- uses: actions/checkout@v3
27+
- uses: actions/checkout@v4
2828
with:
2929
ref: gh-pages
3030
# ignore helm chart index file and chart archive file.

.github/workflows/release.yaml

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ on:
66
jobs:
77
image:
88
name: Push Container Image
9-
runs-on: ubuntu-22.04
9+
runs-on: ubuntu-24.04
1010
steps:
11-
- uses: actions/checkout@v3
11+
- uses: actions/checkout@v4
1212
- name: Build images
1313
run: |
1414
docker build -t accurate:dev .
@@ -22,10 +22,10 @@ jobs:
2222
release:
2323
name: Release on GitHub
2424
needs: image
25-
runs-on: ubuntu-22.04
25+
runs-on: ubuntu-24.04
2626
steps:
27-
- uses: actions/checkout@v3
28-
- uses: actions/setup-go@v3
27+
- uses: actions/checkout@v4
28+
- uses: actions/setup-go@v5
2929
with:
3030
go-version-file: go.mod
3131
cache: true
@@ -37,26 +37,26 @@ jobs:
3737
export TAG=$(curl -s "https://api.github.com/repos/cybozu-go/accurate/releases/latest" | jq -r .tag_name)
3838
echo "GORELEASER_PREVIOUS_TAG=${TAG}" >> $GITHUB_ENV
3939
- name: GoReleaser
40-
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4.2.0
40+
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
4141
with:
4242
distribution: goreleaser
43-
version: v1.15.2
43+
version: v2.6.1
4444
args: release --clean
4545
env:
4646
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4747
- name: Update new version in krew-index
48-
uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0 # v0.0.43
48+
uses: rajatjindal/krew-release-bot@3d9faef30a82761d610544f62afddca00993eef9 # v0.0.47
4949
chart-release:
50-
runs-on: ubuntu-22.04
50+
runs-on: ubuntu-24.04
5151
needs: release
5252
if: contains(needs.release.result, 'success')
5353
steps:
5454
- name: Checkout
55-
uses: actions/checkout@v3
55+
uses: actions/checkout@v4
5656
with:
5757
fetch-depth: 0
5858
- name: Install Helm
59-
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
59+
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
6060
- name: Set chart version
6161
run: |
6262
helm repo add accurate https://cybozu-go.github.io/accurate
@@ -90,7 +90,7 @@ jobs:
9090
git config user.name "$GITHUB_ACTOR"
9191
git config user.email "[email protected]"
9292
- name: Run chart-releaser
93-
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
93+
uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0
9494
with:
9595
config: cr.yaml
9696
env:

.github/workflows/renovate.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ jobs:
77
runs-on: ubuntu-latest
88
steps:
99
- name: Checkout
10-
uses: actions/checkout@v3
10+
uses: actions/checkout@v4
1111
- name: Self-hosted Renovate
12-
uses: renovatebot/github-action@2a87d1192eaa0cac92b6566233afedf68fd3472a # renovate v38.1.8
12+
uses: renovatebot/github-action@e084b5ac6fd201023db6dd7743aec023babb02c8 # renovate v41.0.13
1313
with:
1414
configurationFile: renovate.json
1515
token: ${{ secrets.RENOVATE_TOKEN }}

.goreleaser.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
version: 2
12
builds:
23
- id: kubectl-accurate
34
main: ./cmd/kubectl-accurate
@@ -22,7 +23,7 @@ archives:
2223
- kubectl-accurate
2324
name_template: "kubectl-{{ .ProjectName }}_{{ .Tag }}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{ .Arm }}{{ end }}"
2425
wrap_in_directory: false
25-
format: tar.gz
26+
formats: [ 'tar.gz' ]
2627
files:
2728
- LICENSE
2829

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM ghcr.io/cybozu/golang:1.21-jammy as builder
2+
FROM ghcr.io/cybozu/golang:1.23-jammy as builder
33

44
COPY ./ .
55
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o accurate-controller ./cmd/accurate-controller

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ build:
116116

117117
.PHONY: release-build
118118
release-build: setup
119-
goreleaser build --snapshot --rm-dist
119+
goreleaser build --snapshot --clean
120120

121121
##@ Tools
122122

aqua.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,22 @@
22
# https://aquaproj.github.io/
33
registries:
44
- type: standard
5-
ref: v4.23.0 # renovate: depName=aquaproj/aqua-registry
5+
ref: v4.317.0 # renovate: depName=aquaproj/aqua-registry
66
- name: local
77
type: local
88
path: registry.yaml
99
packages:
10-
- name: kubernetes/kubectl@v1.30.0
10+
- name: kubernetes/kubectl@v1.31.6
1111
- name: kubernetes-sigs/[email protected]
12-
- name: kubernetes-sigs/kustomize@kustomize/v5.4.1
13-
- name: kubernetes-sigs/kind@v0.23.0
14-
- name: rust-lang/[email protected].31
15-
- name: mikefarah/yq@v4.34.1
12+
- name: kubernetes-sigs/kustomize@kustomize/v5.6.0
13+
- name: kubernetes-sigs/kind@v0.26.0
14+
- name: rust-lang/[email protected].45
15+
- name: mikefarah/yq@v4.35.1
1616
- name: clamoriniere/[email protected]
17-
- name: kubernetes-sigs/controller-tools/controller-gen@v0.15.0
18-
- name: helm/helm@v3.12.1
19-
- name: bitnami-labs/sealed-secrets@v0.22.0
20-
- name: goreleaser/goreleaser@v1.19.1
17+
- name: kubernetes-sigs/controller-tools/controller-gen@v0.16.5
18+
- name: helm/helm@v3.17.1
19+
- name: bitnami-labs/sealed-secrets@v0.28.0
20+
- name: goreleaser/goreleaser@v2.6.1
2121
- name: kubernetes/code-generator/[email protected]
2222
registry: local
2323
- name: kubernetes/code-generator/[email protected]

0 commit comments

Comments
 (0)