From 07089e5b43b5d6bba7b2046cf03bcc729f8bd2c2 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Mon, 11 Sep 2023 13:38:56 -0700 Subject: [PATCH] CI: Auto update fuse-overlayfs --- .../update-fuse-overlayfs-version.yml | 60 +++++++++++++++++++ Makefile | 5 ++ .../update_fuse_overlayfs_version.go | 51 ++++++++++++++++ hack/update/get_version/get_version.go | 12 ++-- 4 files changed, 124 insertions(+), 4 deletions(-) create mode 100644 .github/workflows/update-fuse-overlayfs-version.yml create mode 100644 hack/update/fuse_overlayfs_version/update_fuse_overlayfs_version.go diff --git a/.github/workflows/update-fuse-overlayfs-version.yml b/.github/workflows/update-fuse-overlayfs-version.yml new file mode 100644 index 000000000000..684c92e12932 --- /dev/null +++ b/.github/workflows/update-fuse-overlayfs-version.yml @@ -0,0 +1,60 @@ +name: "update-fuse-overlayfs-version" +on: + workflow_dispatch: + schedule: + # every Monday at around 3 am pacific/10 am UTC + - cron: "0 10 * * 1" +env: + GOPROXY: https://proxy.golang.org + GO_VERSION: '1.21.1' +permissions: + contents: read + +jobs: + bump-fuse-overlayfs-version: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@3df4ab11eba7bda6032a0b82a6bb43b11571feac + - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe + with: + go-version: ${{env.GO_VERSION}} + cache-dependency-path: ./go.sum + - name: Bump fuse-overlayfs version + id: bumpFuseOverlayfs + run: | + echo "OLD_VERSION=$(DEP=fuse-overlayfs make get-dependency-version)" >> $GITHUB_OUTPUT + make update-fuse-overlayfs-version + echo "NEW_VERSION=$(DEP=fuse-overlayfs make get-dependency-version)" >> $GITHUB_OUTPUT + # 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 + echo "changes<> $GITHUB_OUTPUT + echo "$(git status --porcelain)" >> $GITHUB_OUTPUT + echo "EOF" >> $GITHUB_OUTPUT + - name: Create PR + id: createPR + if: ${{ steps.bumpFuseOverlayfs.outputs.changes != '' }} + uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: 'Kicbase: Update fuse-overlayfs from ${{ steps.bumpFuseOverlayfs.outputs.OLD_VERSION }} to ${{ steps.bumpFuseOverlayfs.outputs.NEW_VERSION }}' + committer: minikube-bot + author: minikube-bot + branch: auto_bump_fuse-overlayfs_version + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'Kicbase: Update fuse-overlayfs from ${{ steps.bumpFuseOverlayfs.outputs.OLD_VERSION }} to ${{ steps.bumpFuseOverlayfs.outputs.NEW_VERSION }}' + body: | + The fuse-overlayfs project released a [new version](https://github.com/containers/fuse-overlayfs) + + This PR was auto-generated by `make update-fuse-overlayfs-version` using [update-fuse-overlayfs-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-fuse-overlayfs-version.yml) CI Workflow. + - uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 + if: ${{ steps.bumpFuseOverlayfs.outputs.changes != '' }} + with: + github-token: ${{ secrets.MINIKUBE_BOT_PAT }} + script: | + github.rest.issues.createComment({ + issue_number: ${{ steps.createPR.outputs.pull-request-number }}, + owner: context.repo.owner, + repo: context.repo.repo, + body: 'ok-to-build-image' + }) diff --git a/Makefile b/Makefile index af548c2cfedf..de1adc06fdba 100644 --- a/Makefile +++ b/Makefile @@ -1170,6 +1170,11 @@ update-kindnetd-version: (cd hack/update/kindnetd_version && \ go run update_kindnetd_version.go) +.PHONY: update-fuse-overlayfs-version +update-fuse-overlayfs-version: + (cd hack/update/fuse_overlayfs_version && \ + go run update_fuse_overlayfs_version.go) + .PHONY: get-dependency-verison get-dependency-version: @(cd hack/update/get_version && \ diff --git a/hack/update/fuse_overlayfs_version/update_fuse_overlayfs_version.go b/hack/update/fuse_overlayfs_version/update_fuse_overlayfs_version.go new file mode 100644 index 000000000000..a40270e181e1 --- /dev/null +++ b/hack/update/fuse_overlayfs_version/update_fuse_overlayfs_version.go @@ -0,0 +1,51 @@ +/* +Copyright 2023 The Kubernetes Authors All rights reserved. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. +*/ + +package main + +import ( + "context" + "time" + + "k8s.io/klog/v2" + "k8s.io/minikube/hack/update" +) + +var schema = map[string]update.Item{ + "deploy/kicbase/Dockerfile": { + Replace: map[string]string{ + ` FUSE_OVERLAYFS_VERSION=.*`: ` FUSE_OVERLAYFS_VERSION="{{.Version}}"`, + }, + }, +} + +type Data struct { + Version string +} + +func main() { + ctx, cancel := context.WithTimeout(context.Background(), 1*time.Minute) + defer cancel() + + stable, _, _, err := update.GHReleases(ctx, "containers", "fuse-overlayfs") + if err != nil { + klog.Fatalf("Unable to get stable version: %v", err) + } + + data := Data{Version: stable.Tag} + + update.Apply(schema, data) +} diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index d09a62dc40e3..1ba0654ef8b4 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -22,7 +22,10 @@ import ( "regexp" ) -const addonsFile = "pkg/minikube/assets/addons.go" +const ( + addonsFile = "pkg/minikube/assets/addons.go" + dockerfile = "deploy/kicbase/Dockerfile" +) type dependency struct { filePath string @@ -35,11 +38,12 @@ var dependencies = map[string]dependency{ "cloud-spanner": {addonsFile, `cloud-spanner-emulator/emulator:(.*)@`}, "cni-plugins": {"deploy/iso/minikube-iso/arch/x86_64/package/cni-plugins/cni-plugins.mk", `CNI_PLUGINS_VERSION = (.*)`}, "containerd": {"deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk", `CONTAINERD_BIN_VERSION = (.*)`}, - "cri-dockerd": {"deploy/kicbase/Dockerfile", `CRI_DOCKERD_VERSION="(.*)"`}, + "cri-dockerd": {dockerfile, `CRI_DOCKERD_VERSION="(.*)"`}, "cri-o": {"deploy/iso/minikube-iso/package/crio-bin/crio-bin.mk", `CRIO_BIN_VERSION = (.*)`}, "crictl": {"deploy/iso/minikube-iso/arch/x86_64/package/crictl-bin/crictl-bin.mk", `CRICTL_BIN_VERSION = (.*)`}, "docker": {"deploy/iso/minikube-iso/arch/x86_64/package/docker-bin/docker-bin.mk", `DOCKER_BIN_VERSION = (.*)`}, "flannel": {"pkg/minikube/cni/flannel.yaml", `flannel:(.*)`}, + "fuse-overlayfs": {dockerfile, ` FUSE_OVERLAYFS_VERSION="(.*)"`}, "gcp-auth": {addonsFile, `k8s-minikube/gcp-auth-webhook:(.*)@`}, "gh": {"hack/jenkins/installers/check_install_gh.sh", `GH_VERSION="(.*)"`}, "go": {"Makefile", `GO_VERSION \?= (.*)`}, @@ -52,9 +56,9 @@ var dependencies = map[string]dependency{ "inspektor-gadget": {addonsFile, `inspektor-gadget/inspektor-gadget:(.*)@`}, "kindnetd": {"pkg/minikube/bootstrapper/images/images.go", `kindnetd:(.*)"`}, "metrics-server": {addonsFile, `metrics-server/metrics-server:(.*)@`}, - "nerdctl": {"deploy/kicbase/Dockerfile", `NERDCTL_VERSION="(.*)"`}, + "nerdctl": {dockerfile, `NERDCTL_VERSION="(.*)"`}, "runc": {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`}, - "ubuntu": {"deploy/kicbase/Dockerfile", `ubuntu:jammy-(.*)"`}, + "ubuntu": {dockerfile, `ubuntu:jammy-(.*)"`}, } func main() {