diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index da2437625071..b7ce74d6ffdc 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -22,7 +22,9 @@ jobs: - name: Bump Ubuntu version id: bumpUbuntu run: | + echo "OLD_VERSION=$(DEP=ubuntu make get-dependency-version)" >> $GITHUB_OUTPUT make update-ubuntu-version + echo "NEW_VERSION=$(DEP=ubuntu make get-dependency-version)" >> $GITHUB_OUTPUT c=$(git status --porcelain) c="${c//$'\n'/'%0A'}" c="${c//$'\r'/'%0D'}" @@ -35,14 +37,14 @@ jobs: uses: peter-evans/create-pull-request@284f54f989303d2699d373481a0cfa13ad5a6666 with: token: ${{ secrets.MINIKUBE_BOT_PAT }} - commit-message: update ubuntu:focal image version + commit-message: 'Kicbase: Bump ubuntu:focal from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outpus.NEW_VERSION }}' committer: minikube-bot author: minikube-bot branch: auto_bump_ubuntu_version push-to-fork: minikube-bot/minikube base: master delete-branch: true - title: 'Kicbase: Bump ubuntu:focal image version' + title: 'Kicbase: Bump ubuntu:focal from ${{ steps.bumpUbuntu.outputs.OLD_VERSION }} to ${{ steps.bumpUbuntu.outpus.NEW_VERSION }}' body: | The ubuntu:focal image released a new version diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index d1c704311f45..cc3c98ba1b4e 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -41,6 +41,7 @@ var dependencies = map[string]dependency{ "hugo": {"netlify.toml", `HUGO_VERSION = "(.*)"`}, "metrics-server": {"pkg/minikube/assets/addons.go", `metrics-server/metrics-server:(.*)@`}, "runc": {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`}, + "ubuntu": {"deploy/kicbase/Dockerfile", `UBUNTU_FOCAL_IMAGE="(.*)"`}, } func main() {