From 0b06e971de34816361e31abed24d6da4629ce339 Mon Sep 17 00:00:00 2001 From: Steven Powell <44844360+spowelljr@users.noreply.github.com> Date: Mon, 8 May 2023 15:03:23 -0700 Subject: [PATCH] Revert "Update go from 1.20.3 to 1.20.4" --- .github/workflows/build.yml | 2 +- .github/workflows/docs.yml | 2 +- .github/workflows/functional_verified.yml | 2 +- .github/workflows/leaderboard.yml | 2 +- .github/workflows/master.yml | 2 +- .github/workflows/pr.yml | 2 +- .github/workflows/sync-minikube.yml | 2 +- .github/workflows/time-to-k8s-public-chart.yml | 2 +- .github/workflows/time-to-k8s.yml | 2 +- .github/workflows/translations.yml | 2 +- .github/workflows/update-buildkit-version.yml | 2 +- .github/workflows/update-cloud-spanner-emulator-version.yml | 2 +- .github/workflows/update-containerd-version.yml | 2 +- .github/workflows/update-cri-o-version.yml | 2 +- .github/workflows/update-docker-version.yml | 2 +- .github/workflows/update-docsy-version.yml | 2 +- .github/workflows/update-gh-version.yml | 2 +- .github/workflows/update-golang-version.yml | 2 +- .github/workflows/update-golint-version.yml | 2 +- .github/workflows/update-gopogh-version.yml | 2 +- .github/workflows/update-gotestsum-version.yml | 2 +- .github/workflows/update-hugo-version.yml | 2 +- .github/workflows/update-k8s-versions.yml | 2 +- .github/workflows/update-kubeadm-constants.yml | 2 +- .github/workflows/update-metrics-server-version.yml | 2 +- .github/workflows/update-runc-version.yml | 2 +- .github/workflows/update-ubuntu-version.yml | 2 +- .github/workflows/yearly-leaderboard.yml | 2 +- Makefile | 2 +- deploy/addons/auto-pause/Dockerfile | 2 +- deploy/iso/minikube-iso/go.hash | 1 - deploy/kicbase/Dockerfile | 2 +- hack/jenkins/installers/check_install_golang.ps1 | 2 +- hack/jenkins/installers/check_install_golang.sh | 2 +- 34 files changed, 33 insertions(+), 34 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 0e744dcf77f2..1656b1235a46 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index d11254d734b8..f996e80b46e8 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -6,7 +6,7 @@ on: - master env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/functional_verified.yml b/.github/workflows/functional_verified.yml index 4588b504dcdf..db66f003c41f 100644 --- a/.github/workflows/functional_verified.yml +++ b/.github/workflows/functional_verified.yml @@ -22,7 +22,7 @@ on: - deleted env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/leaderboard.yml b/.github/workflows/leaderboard.yml index 9dc4d71159ba..ac562b2fb951 100644 --- a/.github/workflows/leaderboard.yml +++ b/.github/workflows/leaderboard.yml @@ -6,7 +6,7 @@ on: - 'v*-beta.*' env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/master.yml b/.github/workflows/master.yml index 6d4b16c35670..3f72272ed8c5 100644 --- a/.github/workflows/master.yml +++ b/.github/workflows/master.yml @@ -14,7 +14,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index 58834fa695cf..b99bccfd550e 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -12,7 +12,7 @@ on: - "!deploy/iso/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/sync-minikube.yml b/.github/workflows/sync-minikube.yml index 6bb7afb9dbed..2de3104d7708 100644 --- a/.github/workflows/sync-minikube.yml +++ b/.github/workflows/sync-minikube.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s-public-chart.yml b/.github/workflows/time-to-k8s-public-chart.yml index d57367377fa6..66674ab1194d 100644 --- a/.github/workflows/time-to-k8s-public-chart.yml +++ b/.github/workflows/time-to-k8s-public-chart.yml @@ -6,7 +6,7 @@ on: - cron: "0 2,14 * * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/time-to-k8s.yml b/.github/workflows/time-to-k8s.yml index 9193df23fab5..20783abc8f54 100644 --- a/.github/workflows/time-to-k8s.yml +++ b/.github/workflows/time-to-k8s.yml @@ -5,7 +5,7 @@ on: types: [released] env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/translations.yml b/.github/workflows/translations.yml index 5a5e7718e128..cd0edd5beecb 100644 --- a/.github/workflows/translations.yml +++ b/.github/workflows/translations.yml @@ -6,7 +6,7 @@ on: - "translations/**" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-buildkit-version.yml b/.github/workflows/update-buildkit-version.yml index f0da1635d078..076d7d865ee3 100644 --- a/.github/workflows/update-buildkit-version.yml +++ b/.github/workflows/update-buildkit-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 3" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-cloud-spanner-emulator-version.yml b/.github/workflows/update-cloud-spanner-emulator-version.yml index 12349d5a83a3..b3c07863ec67 100644 --- a/.github/workflows/update-cloud-spanner-emulator-version.yml +++ b/.github/workflows/update-cloud-spanner-emulator-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-containerd-version.yml b/.github/workflows/update-containerd-version.yml index 4c33b5134c07..cd0784f148a0 100644 --- a/.github/workflows/update-containerd-version.yml +++ b/.github/workflows/update-containerd-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-cri-o-version.yml b/.github/workflows/update-cri-o-version.yml index 1b404d984820..de8993d554d9 100644 --- a/.github/workflows/update-cri-o-version.yml +++ b/.github/workflows/update-cri-o-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 5" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-docker-version.yml b/.github/workflows/update-docker-version.yml index cc9866297116..0f34b5cd66e5 100644 --- a/.github/workflows/update-docker-version.yml +++ b/.github/workflows/update-docker-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 4" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-docsy-version.yml b/.github/workflows/update-docsy-version.yml index 50cf57483180..0b0b2ad2fc77 100644 --- a/.github/workflows/update-docsy-version.yml +++ b/.github/workflows/update-docsy-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-gh-version.yml b/.github/workflows/update-gh-version.yml index facebd4a6355..94eaa83be8c9 100644 --- a/.github/workflows/update-gh-version.yml +++ b/.github/workflows/update-gh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-golang-version.yml b/.github/workflows/update-golang-version.yml index ecb56fac2241..8d9ebfff376d 100644 --- a/.github/workflows/update-golang-version.yml +++ b/.github/workflows/update-golang-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-golint-version.yml b/.github/workflows/update-golint-version.yml index 918262fd92af..038e0fe0cb2a 100644 --- a/.github/workflows/update-golint-version.yml +++ b/.github/workflows/update-golint-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-gopogh-version.yml b/.github/workflows/update-gopogh-version.yml index b72f24f0705c..7233a4662669 100644 --- a/.github/workflows/update-gopogh-version.yml +++ b/.github/workflows/update-gopogh-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 9 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-gotestsum-version.yml b/.github/workflows/update-gotestsum-version.yml index c81d67e54909..970984b06507 100644 --- a/.github/workflows/update-gotestsum-version.yml +++ b/.github/workflows/update-gotestsum-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-hugo-version.yml b/.github/workflows/update-hugo-version.yml index 47a94b89b0ba..c16c01629f19 100644 --- a/.github/workflows/update-hugo-version.yml +++ b/.github/workflows/update-hugo-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-k8s-versions.yml b/.github/workflows/update-k8s-versions.yml index 2e2ab4eff87d..4f778135defe 100644 --- a/.github/workflows/update-k8s-versions.yml +++ b/.github/workflows/update-k8s-versions.yml @@ -6,7 +6,7 @@ on: - cron: "0 8 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-kubeadm-constants.yml b/.github/workflows/update-kubeadm-constants.yml index c4783e34a420..ca235d5c675b 100644 --- a/.github/workflows/update-kubeadm-constants.yml +++ b/.github/workflows/update-kubeadm-constants.yml @@ -6,7 +6,7 @@ on: - cron: "0 6 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-metrics-server-version.yml b/.github/workflows/update-metrics-server-version.yml index 869c6290ac5d..a0be0f9be720 100644 --- a/.github/workflows/update-metrics-server-version.yml +++ b/.github/workflows/update-metrics-server-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-runc-version.yml b/.github/workflows/update-runc-version.yml index 5506cae8e8b7..c6c0ff839e05 100644 --- a/.github/workflows/update-runc-version.yml +++ b/.github/workflows/update-runc-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 2" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/update-ubuntu-version.yml b/.github/workflows/update-ubuntu-version.yml index 3f9e224d4aba..b7ce74d6ffdc 100644 --- a/.github/workflows/update-ubuntu-version.yml +++ b/.github/workflows/update-ubuntu-version.yml @@ -6,7 +6,7 @@ on: - cron: "0 10 * * 1" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/.github/workflows/yearly-leaderboard.yml b/.github/workflows/yearly-leaderboard.yml index c972cd03f914..4faa723050e0 100644 --- a/.github/workflows/yearly-leaderboard.yml +++ b/.github/workflows/yearly-leaderboard.yml @@ -6,7 +6,7 @@ on: - cron: "0 0 2 * *" env: GOPROXY: https://proxy.golang.org - GO_VERSION: '1.20.4' + GO_VERSION: '1.20.3' permissions: contents: read diff --git a/Makefile b/Makefile index 726695617962..1d5b53472b55 100644 --- a/Makefile +++ b/Makefile @@ -34,7 +34,7 @@ RPM_REVISION ?= 0 # used by hack/jenkins/release_build_and_upload.sh and KVM_BUILD_IMAGE, see also BUILD_IMAGE below # update this only by running `make update-golang-version` -GO_VERSION ?= 1.20.4 +GO_VERSION ?= 1.20.3 # update this only by running `make update-golang-version` GO_K8S_VERSION_PREFIX ?= v1.27.0 diff --git a/deploy/addons/auto-pause/Dockerfile b/deploy/addons/auto-pause/Dockerfile index 190c5fafc816..cfa822029b20 100644 --- a/deploy/addons/auto-pause/Dockerfile +++ b/deploy/addons/auto-pause/Dockerfile @@ -1,2 +1,2 @@ -FROM golang:1.20.4 +FROM golang:1.20.3 ADD auto-pause-hook /auto-pause-hook diff --git a/deploy/iso/minikube-iso/go.hash b/deploy/iso/minikube-iso/go.hash index 55aa59ae023f..8dfc37cf3cc4 100644 --- a/deploy/iso/minikube-iso/go.hash +++ b/deploy/iso/minikube-iso/go.hash @@ -11,4 +11,3 @@ sha256 3a29ff0421beaf6329292b8a46311c9fbf06c800077ceddef5fb7f8d5b1ace33 go1.20 sha256 b5c1a3af52c385a6d1c76aed5361cf26459023980d0320de7658bae3915831a2 go1.20.1.src.tar.gz sha256 4d0e2850d197b4ddad3bdb0196300179d095bb3aefd4dfbc3b36702c3728f8ab go1.20.2.src.tar.gz sha256 e447b498cde50215c4f7619e5124b0fc4e25fb5d16ea47271c47f278e7aa763a go1.20.3.src.tar.gz -sha256 9f34ace128764b7a3a4b238b805856cc1b2184304df9e5690825b0710f4202d6 go1.20.4.src.tar.gz diff --git a/deploy/kicbase/Dockerfile b/deploy/kicbase/Dockerfile index b7a78519559f..b1891ab9986b 100644 --- a/deploy/kicbase/Dockerfile +++ b/deploy/kicbase/Dockerfile @@ -21,7 +21,7 @@ # this ARG needs to be global to use it in `FROM` & is updated for new versions of ubuntu:focal-* ARG UBUNTU_FOCAL_IMAGE="ubuntu:focal-20230308" # multi-stage docker build so we can build auto-pause for arm64 -FROM golang:1.20.4 as auto-pause +FROM golang:1.20.3 as auto-pause WORKDIR /src # auto-pause depends on core minikube code so we need to pass the whole source code as the context # copy in the minimal amount of source code possible diff --git a/hack/jenkins/installers/check_install_golang.ps1 b/hack/jenkins/installers/check_install_golang.ps1 index 6cb3fa5d2a12..22531053917a 100644 --- a/hack/jenkins/installers/check_install_golang.ps1 +++ b/hack/jenkins/installers/check_install_golang.ps1 @@ -31,7 +31,7 @@ AddToPathIfMissing -pathToAdd "C:\Program Files\Go\bin" -scope "Machine" AddToPathIfMissing -pathToAdd "$HOME\go\bin" -scope "User" # Download Go -$GoVersion = "1.20.4" +$GoVersion = "1.20.3" $CurrentGo = go version if ((!$?) -or ($CurrentGo -NotLike "*$GoVersion*")) { (New-Object Net.WebClient).DownloadFile("https://go.dev/dl/go$GoVersion.windows-amd64.zip", "$env:TEMP\golang.zip") diff --git a/hack/jenkins/installers/check_install_golang.sh b/hack/jenkins/installers/check_install_golang.sh index 6e3331858274..cc716043dbe4 100755 --- a/hack/jenkins/installers/check_install_golang.sh +++ b/hack/jenkins/installers/check_install_golang.sh @@ -22,7 +22,7 @@ if (($# < 1)); then exit 1 fi -VERSION_TO_INSTALL=1.20.4 +VERSION_TO_INSTALL=1.20.3 INSTALL_PATH=${1} function current_arch() {