Skip to content

Commit

Permalink
chore: update dependencies and improve workflow configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
012xx committed Feb 21, 2025
1 parent 0d94bbd commit 91a419c
Show file tree
Hide file tree
Showing 19 changed files with 262 additions and 358 deletions.
4 changes: 2 additions & 2 deletions .github/actions/aqua/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ inputs:
runs:
using: composite
steps:
- uses: aquaproj/aqua-installer@4551ec64e21bf0f557c2525135ff0bd2cba40ec7 # v3.0.0
- uses: aquaproj/aqua-installer@e2d0136abcf70b7a2f6f505720640750557c4b33 # 3.1.1
with:
aqua_version: v2.27.3
aqua_version: v2.44.1
policy_allow: "true"
env:
GITHUB_TOKEN: ${{ inputs.github_token }}
24 changes: 12 additions & 12 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ on:
jobs:
build:
name: Build binaries
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- uses: ./.github/actions/aqua
Expand All @@ -19,10 +19,10 @@ jobs:
- run: make release-build
test:
name: Small tests
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
- uses: ./.github/actions/aqua
Expand All @@ -36,13 +36,13 @@ jobs:
strategy:
matrix:
k8s-version:
- v1.28.7 # renovate: kindest/node
- v1.29.2 # renovate: kindest/node
- v1.30.0 # renovate: kindest/node
runs-on: ubuntu-22.04
- v1.29.12 # renovate: kindest/node
- v1.30.8 # renovate: kindest/node
- v1.31.4 # renovate: kindest/node
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache: true
Expand Down
14 changes: 7 additions & 7 deletions .github/workflows/helm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,18 @@ on:

jobs:
lint-test:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04

steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: 3.7
python-version: 3.13
- name: Set up chart-testing
uses: helm/chart-testing-action@v2.2.1
uses: helm/chart-testing-action@v2.7.0

- name: Run chart-testing (list-changed)
id: list-changed
Expand All @@ -33,10 +33,10 @@ jobs:
run: ct lint --config ct.yaml

- name: Create kind cluster
uses: helm/kind-action@v1.10.0
uses: helm/kind-action@v1.12.0
if: steps.list-changed.outputs.changed == 'true'
with:
node_image: kindest/node:v1.30.0
node_image: kindest/node:v1.31.4
- name: Apply cert-manager
run: |
kubectl apply -f https://github.com/jetstack/cert-manager/releases/latest/download/cert-manager.yaml
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/mdbook.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
jobs:
build:
name: Build book
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: ./.github/actions/aqua
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
Expand All @@ -21,10 +21,10 @@ jobs:
retention-days: 1
publish:
name: Publish book on GitHub Pages
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: build
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: gh-pages
# ignore helm chart index file and chart archive file.
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ on:
jobs:
image:
name: Push Container Image
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Build images
run: |
docker build -t accurate:dev .
Expand All @@ -22,10 +22,10 @@ jobs:
release:
name: Release on GitHub
needs: image
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v3
- uses: actions/setup-go@v3
- uses: actions/checkout@v4
- uses: actions/setup-go@v5
with:
go-version-file: go.mod
cache: true
Expand All @@ -37,26 +37,26 @@ jobs:
export TAG=$(curl -s "https://api.github.com/repos/cybozu-go/accurate/releases/latest" | jq -r .tag_name)
echo "GORELEASER_PREVIOUS_TAG=${TAG}" >> $GITHUB_ENV
- name: GoReleaser
uses: goreleaser/goreleaser-action@f82d6c1c344bcacabba2c841718984797f664a6b # v4.2.0
uses: goreleaser/goreleaser-action@9ed2f89a662bf1735a48bc8557fd212fa902bebf # v6.1.0
with:
distribution: goreleaser
version: v1.15.2
version: v2.6.1
args: release --clean
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update new version in krew-index
uses: rajatjindal/krew-release-bot@92da038bbf995803124a8e50ebd438b2f37bbbb0 # v0.0.43
uses: rajatjindal/krew-release-bot@3d9faef30a82761d610544f62afddca00993eef9 # v0.0.47
chart-release:
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
needs: release
if: contains(needs.release.result, 'success')
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Install Helm
uses: azure/setup-helm@5119fcb9089d432beecbf79bb2c7915207344b78 # v3.5
uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4.2.0
- name: Set chart version
run: |
helm repo add accurate https://cybozu-go.github.io/accurate
Expand Down Expand Up @@ -90,7 +90,7 @@ jobs:
git config user.name "$GITHUB_ACTOR"
git config user.email "$GITHUB_ACTOR@users.noreply.github.com"
- name: Run chart-releaser
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
uses: helm/chart-releaser-action@a917fd15b20e8b64b94d9158ad54cd6345335584 # v1.6.0
with:
config: cr.yaml
env:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/renovate.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
- name: Self-hosted Renovate
uses: renovatebot/github-action@2a87d1192eaa0cac92b6566233afedf68fd3472a # renovate v38.1.8
uses: renovatebot/github-action@e084b5ac6fd201023db6dd7743aec023babb02c8 # renovate v41.0.13
with:
configurationFile: renovate.json
token: ${{ secrets.RENOVATE_TOKEN }}
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM ghcr.io/cybozu/golang:1.21-jammy as builder
FROM ghcr.io/cybozu/golang:1.23-jammy as builder

COPY ./ .
RUN CGO_ENABLED=0 go build -ldflags="-w -s" -o accurate-controller ./cmd/accurate-controller
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ build:

.PHONY: release-build
release-build: setup
goreleaser build --snapshot --rm-dist
goreleaser build --snapshot --clean

##@ Tools

Expand Down
2 changes: 1 addition & 1 deletion PROJECT
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
domain: cybozu.com
layout:
- go.kubebuilder.io/v3
- go.kubebuilder.io/v4
projectName: accurate
repo: github.com/cybozu-go/accurate
resources:
Expand Down
22 changes: 11 additions & 11 deletions aqua.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,22 @@
# https://aquaproj.github.io/
registries:
- type: standard
ref: v4.23.0 # renovate: depName=aquaproj/aqua-registry
ref: v4.317.0 # renovate: depName=aquaproj/aqua-registry
- name: local
type: local
path: registry.yaml
packages:
- name: kubernetes/kubectl@v1.30.0
- name: kubernetes-sigs/kubebuilder@v3.14.2
- name: kubernetes-sigs/kustomize@kustomize/v5.4.1
- name: kubernetes-sigs/kind@v0.23.0
- name: rust-lang/mdBook@v0.4.31
- name: mikefarah/yq@v4.34.1
- name: kubernetes/kubectl@v1.31.6
- name: kubernetes-sigs/kubebuilder@v4.5.0
- name: kubernetes-sigs/kustomize@kustomize/v5.6.0
- name: kubernetes-sigs/kind@v0.26.0
- name: rust-lang/mdBook@v0.4.45
- name: mikefarah/yq@v4.35.1
- name: clamoriniere/crd-to-markdown@v0.0.3
- name: kubernetes-sigs/controller-tools/controller-gen@v0.15.0
- name: helm/helm@v3.12.1
- name: bitnami-labs/sealed-secrets@v0.22.0
- name: goreleaser/goreleaser@v1.19.1
- name: kubernetes-sigs/controller-tools/controller-gen@v0.17.2
- name: helm/helm@v3.17.1
- name: bitnami-labs/sealed-secrets@v0.28.0
- name: goreleaser/goreleaser@v2.6.1
- name: kubernetes/code-generator/applyconfiguration-gen@v0.30.0
registry: local
- name: kubernetes/code-generator/conversion-gen@v0.30.0
Expand Down
24 changes: 5 additions & 19 deletions charts/accurate/templates/generated/crds.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 7 additions & 19 deletions config/crd/bases/accurate.cybozu.com_subnamespaces.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 91a419c

Please sign in to comment.