From 9d31fedfdab1c41bfe970a638151c908cd925d92 Mon Sep 17 00:00:00 2001 From: Steven Powell Date: Tue, 26 Sep 2023 19:28:19 -0700 Subject: [PATCH] Auto update kong image --- .github/workflows/update-kong-version.yml | 49 +++++++++++++++ Makefile | 5 ++ hack/update/get_version/get_version.go | 1 + .../kong_version/update_kong_version.go | 59 +++++++++++++++++++ 4 files changed, 114 insertions(+) create mode 100644 .github/workflows/update-kong-version.yml create mode 100644 hack/update/kong_version/update_kong_version.go diff --git a/.github/workflows/update-kong-version.yml b/.github/workflows/update-kong-version.yml new file mode 100644 index 000000000000..7ce2e11f5f09 --- /dev/null +++ b/.github/workflows/update-kong-version.yml @@ -0,0 +1,49 @@ +name: "update-kong-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-kong-version: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@8ade135a41bc03ea155e62e844d188df1ea18608 + - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe + with: + go-version: ${{env.GO_VERSION}} + cache-dependency-path: ./go.sum + - name: Bump kong version + id: bumpKong + run: | + echo "OLD_VERSION=$(DEP=kong make get-dependency-version)" >> $GITHUB_OUTPUT + make update-kong-version + echo "NEW_VERSION=$(DEP=kong 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 + if: ${{ steps.bumpKong.outputs.changes != '' }} + uses: peter-evans/create-pull-request@153407881ec5c347639a548ade7d8ad1d6740e38 + with: + token: ${{ secrets.MINIKUBE_BOT_PAT }} + commit-message: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' + committer: minikube-bot + author: minikube-bot + branch: auto_bump_kong_version + push-to-fork: minikube-bot/minikube + base: master + delete-branch: true + title: 'Addon kong: Update kong image from ${{ steps.bumpKong.outputs.OLD_VERSION }} to ${{ steps.bumpKong.outputs.NEW_VERSION }}' + labels: ok-to-test + body: | + The [kong](https://github.com/Kong/kong) project released a new kong image + + This PR was auto-generated by `make update-kong-version` using [update-kong-version.yml](https://github.com/kubernetes/minikube/tree/master/.github/workflows/update-kong-version.yml) CI Workflow. diff --git a/Makefile b/Makefile index cb6e8c1a507c..ab097b0038f8 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-kong-version +update-kong-version: + (cd hack/update/kong_version && \ + go run update_kong_version.go) + .PHONY: get-dependency-verison get-dependency-version: @(cd hack/update/get_version && \ diff --git a/hack/update/get_version/get_version.go b/hack/update/get_version/get_version.go index d09a62dc40e3..afaf83d26321 100644 --- a/hack/update/get_version/get_version.go +++ b/hack/update/get_version/get_version.go @@ -51,6 +51,7 @@ var dependencies = map[string]dependency{ "ingress": {addonsFile, `ingress-nginx/controller:(.*)@`}, "inspektor-gadget": {addonsFile, `inspektor-gadget/inspektor-gadget:(.*)@`}, "kindnetd": {"pkg/minikube/bootstrapper/images/images.go", `kindnetd:(.*)"`}, + "kong": {addonsFile, `kong:(.*)@`}, "metrics-server": {addonsFile, `metrics-server/metrics-server:(.*)@`}, "nerdctl": {"deploy/kicbase/Dockerfile", `NERDCTL_VERSION="(.*)"`}, "runc": {"deploy/iso/minikube-iso/package/runc-master/runc-master.mk", `RUNC_MASTER_VERSION = (.*)`}, diff --git a/hack/update/kong_version/update_kong_version.go b/hack/update/kong_version/update_kong_version.go new file mode 100644 index 000000000000..935a7ef89b56 --- /dev/null +++ b/hack/update/kong_version/update_kong_version.go @@ -0,0 +1,59 @@ +/* +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" + "fmt" + "strings" + "time" + + "k8s.io/klog/v2" + "k8s.io/minikube/hack/update" +) + +var schema = map[string]update.Item{ + "pkg/minikube/assets/addons.go": { + Replace: map[string]string{ + `kong:.*`: `kong:{{.Version}}@{{.SHA}}",`, + }, + }, +} + +type Data struct { + Version string + SHA string +} + +func main() { + ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute) + defer cancel() + + stable, _, _, err := update.GHReleases(ctx, "Kong", "kong") + if err != nil { + klog.Fatalf("Unable to get stable version: %v", err) + } + version := strings.TrimPrefix(stable.Tag, "v") + sha, err := update.GetImageSHA(fmt.Sprintf("docker.io/kong:%s", version)) + if err != nil { + klog.Fatalf("failed to get image SHA: %v", err) + } + + data := Data{Version: version, SHA: sha} + + update.Apply(schema, data) +}