Skip to content

Commit 11b1349

Browse files
medyaghmedyagh
authored
Merge pull request #18434 from spowelljr/addCrunWorkflow
CI: Auto update crun
2 parents b74cc15 + b749e1e commit 11b1349

File tree

3 files changed

+80
-0
lines changed

3 files changed

+80
-0
lines changed

‎.github/workflows/update-crun-version.yml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
name: "update-crun-version"
2+
on:
3+
workflow_dispatch:
4+
schedule:
5+
# every Wednesday at around 3 am pacific/10 am UTC
6+
- cron: "0 10 * * 3"
7+
env:
8+
GOPROXY: https://proxy.golang.org
9+
GO_VERSION: '1.22.1'
10+
permissions:
11+
contents: read
12+
13+
jobs:
14+
bump-crun-version:
15+
runs-on: ubuntu-20.04
16+
steps:
17+
- uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633
18+
- uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491
19+
with:
20+
go-version: ${{env.GO_VERSION}}
21+
cache-dependency-path: ./go.sum
22+
- name: Bump crun Version
23+
id: bumpCrun
24+
run: |
25+
echo "OLD_VERSION=$(DEP=crun make get-dependency-version)" >> "$GITHUB_OUTPUT"
26+
make update-crun-version
27+
echo "NEW_VERSION=$(DEP=crun make get-dependency-version)" >> "$GITHUB_OUTPUT"
28+
# The following is to support multiline with GITHUB_OUTPUT, see https://docs.github.com/en/actions/using-workflows/workflow-commands-for-github-actions#multiline-strings
29+
echo "changes<<EOF" >> "$GITHUB_OUTPUT"
30+
echo "$(git status --porcelain)" >> "$GITHUB_OUTPUT"
31+
echo "EOF" >> "$GITHUB_OUTPUT"
32+
- name: Create PR
33+
id: createPR
34+
if: ${{ steps.bumpCrun.outputs.changes != '' }}
35+
uses: peter-evans/create-pull-request@70a41aba780001da0a30141984ae2a0c95d8704e
36+
with:
37+
token: ${{ secrets.MINIKUBE_BOT_PAT }}
38+
commit-message: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}'
39+
committer: minikube-bot <minikube-bot@google.com>
40+
author: minikube-bot <minikube-bot@google.com>
41+
branch: auto_bump_crun_version
42+
branch-suffix: short-commit-hash
43+
push-to-fork: minikube-bot/minikube
44+
base: master
45+
delete-branch: true
46+
title: 'Kicbase/ISO: Update crun from ${{ steps.bumpCrun.outputs.OLD_VERSION }} to ${{ steps.bumpCrun.outputs.NEW_VERSION }}'
47+
body: |
48+
The crun project released a [new version](https://github.com/containers/crun/releases)
49+
50+
This PR was auto-generated by `make update-crun-version` using [update-crun-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-crun-version.yml) CI Workflow.
51+
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
52+
if: ${{ steps.bumpCrun.outputs.changes != '' }}
53+
with:
54+
github-token: ${{ secrets.MINIKUBE_BOT_PAT }}
55+
script: |
56+
github.rest.issues.createComment({
57+
issue_number: ${{ steps.createPR.outputs.pull-request-number }},
58+
owner: context.repo.owner,
59+
repo: context.repo.repo,
60+
body: 'ok-to-build-image'
61+
})
62+
- uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea
63+
if: ${{ steps.bumpCrun.outputs.changes != '' }}
64+
with:
65+
github-token: ${{ secrets.MINIKUBE_BOT_PAT }}
66+
script: |
67+
github.rest.issues.createComment({
68+
issue_number: ${{ steps.createPR.outputs.pull-request-number }},
69+
owner: context.repo.owner,
70+
repo: context.repo.repo,
71+
body: 'ok-to-build-iso'
72+
})

‎.github/workflows/update-iso-image-versions.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ jobs:
2323
OLD_CONTAINERD=$(DEP=containerd make get-dependency-version)
2424
OLD_CRIO=$(DEP=cri-o make get-dependency-version)
2525
OLD_CRICTL=$(DEP=crictl make get-dependency-version)
26+
OLD_CRUN=$(DEP=crun make get-dependency-version)
2627
OLD_DOCKER=$(DEP=docker make get-dependency-version)
2728
OLD_GO=$(DEP=go make get-dependency-version)
2829
OLD_NERDCTL=$(DEP=nerdctl make get-dependency-version)
@@ -35,6 +36,7 @@ jobs:
3536
# Uncomment after crictl/cri-o issue resolved: https://github.com/kubernetes/minikube/issues/18359
3637
# make update-cri-o-version
3738
# make update-crictl-version
39+
make update-crun-version
3840
make update-docker-version
3941
make update-golang-version
4042
make update-nerdctl-version
@@ -46,6 +48,7 @@ jobs:
4648
NEW_CONTAINERD=$(DEP=containerd make get-dependency-version)
4749
NEW_CRIO=$(DEP=cri-o make get-dependency-version)
4850
NEW_CRICTL=$(DEP=crictl make get-dependency-version)
51+
NEW_CRUN=$(DEP=crun make get-dependency-version)
4952
NEW_DOCKER=$(DEP=docker make get-dependency-version)
5053
NEW_GO=$(DEP=go make get-dependency-version)
5154
NEW_NERDCTL=$(DEP=nerdctl make get-dependency-version)
@@ -73,6 +76,10 @@ jobs:
7376
echo "### Update crictl from $OLD_CRICTL to $NEW_CRICTL" >> "$GITHUB_OUTPUT"
7477
echo "[Release notes](https://github.com/kubernetes-sigs/cri-tools/releases)" >> "$GITHUB_OUTPUT"
7578
fi
79+
if [ "$OLD_CRUN" != "$NEW_CRUN" ]; then
80+
echo "### Update crun from $OLD_CRUN to $NEW_CRUN" >> "$GITHUB_OUTPUT"
81+
echo "[Release notes](https://github.com/containers/crun/releases)" >> "$GITHUB_OUTPUT"
82+
fi
7683
if [ "$OLD_DOCKER" != "$NEW_DOCKER" ]; then
7784
echo "### Update Docker from $OLD_DOCKER to $NEW_DOCKER" >> "$GITHUB_OUTPUT"
7885
echo "[Release notes](https://github.com/moby/moby/releases)" >> "$GITHUB_OUTPUT"

‎hack/update/get_version/get_version.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ var dependencies = map[string]dependency{
4141
"cri-dockerd": {dockerfile, `CRI_DOCKERD_VERSION="(.*)"`},
4242
"cri-o": {"deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk", `CRIO_BIN_VERSION = (.*)`},
4343
"crictl": {"deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk", `CRICTL_BIN_VERSION = (.*)`},
44+
"crun": {"deploy/iso/minikube-iso/package/crun-latest/crun-latest.mk", `CRUN_LATEST_VERSION = (.*)`},
4445
"docker": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk", `DOCKER_BIN_VERSION = (.*)`},
4546
"flannel": {"pkg/minikube/cni/flannel.yaml", `flannel:(.*)`},
4647
"gcp-auth": {addonsFile, `k8s-minikube/gcp-auth-webhook:(.*)@`},

0 commit comments

Comments
 (0)