Skip to content

Commit c9625cf

Browse files
gokken-rokogokken-roko
authored
Merge pull request #66 from cybozu-go/k8s-1.32
Bump supported K8s version from 1.31 to 1.32
2 parents 0c7d36d + 574e13e commit c9625cf

File tree

13 files changed

+61
-56
lines changed

13 files changed

+61
-56
lines changed

‎.github/actions/aqua/action.yaml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ inputs:
77
runs:
88
using: composite
99
steps:
10-
- uses: aquaproj/aqua-installer@e2d0136abcf70b7a2f6f505720640750557c4b33 # v3.1.1
10+
- uses: aquaproj/aqua-installer@9ebf656952a20c45a5d66606f083ff34f58b8ce0 # v４.0.0
1111
with:
12-
aqua_version: v2.44.1
13-
env:
14-
GITHUB_TOKEN: ${{ inputs.github_token }}
12+
aqua_version: v2.53.3
13+
github_token: ${{ inputs.github_token }}

‎.github/workflows/ci.yaml‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
strategy:
5353
matrix:
5454
k8s-version:
55-
- v1.29.12 # renovate: kindest/node
56-
- v1.30.8 # renovate: kindest/node
57-
- v1.31.4 # renovate: kindest/node
55+
- v1.30.13@sha256:397209b3d947d154f6641f2d0ce8d473732bd91c87d9575ade99049aa33cd648 # renovate: kindest/node
56+
- v1.31.9@sha256:b94a3a6c06198d17f59cca8c6f486236fa05e2fb359cbd75dabbfc348a10b211 # renovate: kindest/node
57+
- v1.32.5@sha256:e3b2327e3a5ab8c76f5ece68936e4cafaa82edf58486b769727ab0b3b97a5b0d # renovate: kindest/node
5858
runs-on: ubuntu-24.04
5959
steps:
6060
- uses: actions/checkout@v4
@@ -72,10 +72,16 @@ jobs:
7272
- run: make logs
7373
working-directory: e2e
7474
if: always()
75+
- name: Sanitize version name
76+
id: sanitize
77+
run: |
78+
# extract only version name because ':' is not allowed for artifact name
79+
SANITIZED_K8S_VERSION="$(echo ${{ matrix.k8s-version}} | awk -F '@' '{print $1}')"
80+
echo "SANITIZED_K8S_VERSION=$SANITIZED_K8S_VERSION" >> $GITHUB_OUTPUT
7581
- uses: actions/upload-artifact@v4
7682
if: always()
7783
with:
78-
name: logs-${{ matrix.k8s-version }}.tar.gz
84+
name: logs-${{ steps.sanitize.outputs.SANITIZED_K8S_VERSION }}.tar.gz
7985
path: e2e/logs.tar.gz
8086
tilt:
8187
name: Run tilt ci

‎.github/workflows/release.yaml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,19 @@ jobs:
5353
run: |
5454
helm repo add cattage https://cybozu-go.github.io/cattage
5555
helm repo update
56-
56+
5757
# get the release tag version
5858
tag_version=${GITHUB_REF##*/v}
59-
59+
6060
# get the latest chart version
6161
chart_version=$(helm search repo cattage -o json | jq -r 'sort_by(.version) | .[-1].version')
6262
chart_patch_version=${chart_version##*.}
6363
new_patch_version=$(($chart_patch_version+1))
64-
64+
6565
# if minor or major version changed, reset new patch version
6666
local_version=$(cat charts/cattage/Chart.yaml | yq .version | sed "s/0-chart-patch-version-placeholder/$chart_patch_version/g")
6767
[ "$local_version" != "$chart_version" ] && new_patch_version=0
68-
68+
6969
# replace placeholder with new version
7070
sed --in-place "s/app-version-placeholder/$tag_version/g" charts/cattage/Chart.yaml
7171
sed --in-place "s/0-chart-patch-version-placeholder/$new_patch_version/g" charts/cattage/Chart.yaml
@@ -75,14 +75,14 @@ jobs:
7575
tag_version=${GITHUB_REF##*/}
7676
cat <<EOF > ./charts/cattage/RELEASE.md
7777
Helm chart for cattage [$tag_version](https://github.com/cybozu-go/cattage/releases/tag/$tag_version)
78-
78+
7979
EOF
8080
- name: Configure Git
8181
run: |
8282
git config user.name "$GITHUB_ACTOR"
8383
git config user.email "[email protected]"
8484
- name: Run chart-releaser
85-
uses: helm/chart-releaser-action@be16258da8010256c6e82849661221415f031968 # v1.5.0
85+
uses: helm/chart-releaser-action@cae68fefc6b5f367a0275617c9f83181ba54714f # v1.7.0
8686
with:
8787
config: cr.yaml
8888
env:

‎.github/workflows/renovate.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
- name: Checkout
1010
uses: actions/checkout@v4
1111
- name: Self-hosted Renovate
12-
uses: renovatebot/github-action@02f4fdeb479bbb229caa7ad82cb5e691c07e80b3 # renovate v41.0.14
12+
uses: renovatebot/github-action@248bf5a619694187930adc80b9343c37761c173f # renovate v43.0.1
1313
with:
1414
configurationFile: renovate.json
1515
token: ${{ secrets.RENOVATE_TOKEN }}

‎README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ Cattage supports the following versions:
2222

2323
| Cattage | Argo CD | Accurate |
2424
|--------------|---------|----------|
25+
| 1.5.0 | 2.13.x | 1.4.x |
26+
| 1.4.3 | 2.11.x | 1.4.x |
2527
| 1.2.0 | 2.10.x | 1.3.x |
2628
| 1.1.0 | 2.6.x | 1.0.x |
2729
| 1.0.0 | 2.5.x | 0.4.x |

‎aqua.yaml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,17 @@
33
# https://aquaproj.github.io/
44
registries:
55
- type: standard
6-
ref: v4.317.0 # renovate: depName=aquaproj/aqua-registry
6+
ref: v4.379.2 # renovate: depName=aquaproj/aqua-registry
77
packages:
88
- name: argoproj/[email protected]
9-
- name: kubernetes/kubectl@v1.31.6
9+
- name: kubernetes/kubectl@v1.32.6
1010
- name: kubernetes-sigs/[email protected]
1111
- name: kubernetes-sigs/kustomize@kustomize/v5.6.0
12-
- name: kubernetes-sigs/kind@v0.26.0
13-
- name: rust-lang/[email protected].45
14-
- name: tilt-dev/tilt@v0.33.22
15-
- name: tilt-dev/[email protected].39
12+
- name: kubernetes-sigs/kind@v0.29.0
13+
- name: rust-lang/[email protected].51
14+
- name: tilt-dev/tilt@v0.35.0
15+
- name: tilt-dev/[email protected].42
1616
- name: GoogleContainerTools/[email protected]
17-
- name: mikefarah/[email protected].1
17+
- name: mikefarah/[email protected].4
1818
- name: clamoriniere/[email protected]
19-
- name: kubernetes-sigs/controller-tools/controller-gen@v0.16.5
19+
- name: kubernetes-sigs/controller-tools/controller-gen@v0.17.3

‎charts/cattage/crds/tenant.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: apiextensions.k8s.io/v1
22
kind: CustomResourceDefinition
33
metadata:
44
annotations:
5-
controller-gen.kubebuilder.io/version: v0.16.5
5+
controller-gen.kubebuilder.io/version: v0.17.3
66
labels:
77
app.kubernetes.io/name: cattage
88
name: tenants.cattage.cybozu.io

‎cluster.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@ apiVersion: ctlptl.dev/v1alpha1
77
kind: Cluster
88
name: kind-cattage-dev
99
product: kind
10-
kubernetesVersion: v1.31.4 # renovate: kindest/node
10+
kubernetesVersion: v1.32.5 # renovate: kindest/node
1111
registry: ctlptl-registry

‎config/crd/bases/cattage.cybozu.io_tenants.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.16.5
6+
controller-gen.kubebuilder.io/version: v0.17.3
77
name: tenants.cattage.cybozu.io
88
spec:
99
group: cattage.cybozu.io

‎docs/maintenance.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ If a new Argo CD is released, please update the following files.
1818

1919
- Update Argo CD Version in `aqua.yaml` and `Makefile`.
2020
- Run `make crds`.
21+
- Update Supported Version metrics in [README.md](../README.md)
2122

2223
If Argo CD API has changed, please fix the relevant source code.
2324

0 commit comments

Comments
 (0)