Merge pull request #15702 from spowelljr/improveGoVersionUpdating

CI: Improve automated golang version updating

Author: spowelljr

…ithub/workflows/update_docsy_version.yml …ithub/workflows/update-docsy-version.yml.github/workflows/update_docsy_version.yml renamed to .github/workflows/update-docsy-version.yml .github/workflows/update_docsy_version.yml renamed to .github/workflows/update-docsy-version.yml

@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.3'
+  GO_VERSION: '1.19.5'
 permissions:
   contents: read
 

.github/workflows/update-hugo-version.yml

@@ -6,7 +6,7 @@ on:
     - cron: "0 10 * * 1"
 env:
   GOPROXY: https://proxy.golang.org
-  GO_VERSION: '1.19.3'
+  GO_VERSION: '1.19.5'
 permissions:
   contents: read
 

Makefile

@@ -45,7 +45,7 @@ KVM_GO_VERSION ?= $(GO_VERSION:.0=)
 INSTALL_SIZE ?= $(shell du out/minikube-windows-amd64.exe | cut -f1)
 BUILDROOT_BRANCH ?= 2021.02.12
 # the go version on the line below is for the ISO and does not need to be updated often
-GOLANG_OPTIONS = GO_VERSION=1.19.3 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
+GOLANG_OPTIONS = GO_VERSION=1.19.5 GO_HASH_FILE=$(PWD)/deploy/iso/minikube-iso/go.hash
 BUILDROOT_OPTIONS = BR2_EXTERNAL=../../deploy/iso/minikube-iso $(GOLANG_OPTIONS)
 REGISTRY ?= gcr.io/k8s-minikube
 

deploy/addons/auto-pause/Dockerfile

@@ -1,2 +1,2 @@
-FROM golang:1.19.3
+FROM golang:1.19.5
 ADD auto-pause-hook /auto-pause-hook

deploy/iso/minikube-iso/go.hash

@@ -1,7 +1,8 @@
 # From https://go.dev/dl/
+sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE
 sha256  3a70e5055509f347c0fb831ca07a2bf3b531068f349b14a3c652e9b5b67beb5d  go1.17.src.tar.gz
 sha256  0012386ddcbb5f3350e407c679923811dbd283fcdc421724931614a842ecbc2d  go1.18.3.src.tar.gz
 sha256  27871baa490f3401414ad793fba49086f6c855b1c584385ed7771e1204c7e179  go1.19.1.src.tar.gz
 sha256  2ce930d70a931de660fdaf271d70192793b1b240272645bf0275779f6704df6b  go1.19.2.src.tar.gz
 sha256  18ac263e39210bcf68d85f4370e97fb1734166995a1f63fb38b4f6e07d90d212  go1.19.3.src.tar.gz
-sha256  2d36597f7117c38b006835ae7f537487207d8ec407aa9d9980794b2030cbc067  LICENSE
+sha256  8e486e8e85a281fc5ce3f0bedc5b9d2dbf6276d7db0b25d3ec034f313da0375f  go1.19.5.src.tar.gz

deploy/kicbase/Dockerfile

@@ -19,7 +19,7 @@
 
 
 # multi-stage docker build so we can build auto-pause for arm64
-FROM golang:1.19.3 as auto-pause
+FROM golang:1.19.5 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

hack/update/golang_version/update_golang_version.go

@@ -17,8 +17,10 @@ limitations under the License.
 package main
 
 import (
+	"fmt"
 	"io"
 	"net/http"
+	"os"
 	"strings"
 
 	"k8s.io/klog/v2"
@@ -138,6 +140,7 @@ var (
 				// searching for 1.* so it does NOT match "KVM_GO_VERSION ?= $(GO_VERSION:.0=)" in the Makefile
 				`GO_VERSION \?= 1.*`:             `GO_VERSION ?= {{.StableVersion}}`,
 				`GO_K8S_VERSION_PREFIX \?= v1.*`: `GO_K8S_VERSION_PREFIX ?= {{.K8SVersion}}`,
+				`GO_VERSION=[0-9.]+`:             `GO_VERSION={{.StableVersion}}`,
 			},
 		},
 		"hack/jenkins/installers/check_install_golang.sh": {
@@ -150,6 +153,16 @@ var (
 				`GoVersion = ".*"`: `GoVersion = "{{.StableVersion}}"`,
 			},
 		},
+		"deploy/kicbase/Dockerfile": {
+			Replace: map[string]string{
+				`golang:[0-9.]+`: `golang:{{.StableVersion}}`,
+			},
+		},
+		"deploy/addons/auto-pause/Dockerfile": {
+			Replace: map[string]string{
+				`golang:.*`: `golang:{{.StableVersion}}`,
+			},
+		},
 	}
 )
 
@@ -176,6 +189,10 @@ func main() {
 	klog.Infof("Golang stable version: %s", data.StableVersion)
 
 	update.Apply(schema, data)
+
+	if err := updateGoHashFile(stable); err != nil {
+		klog.Fatalf("failed to update go hash file: %v", err)
+	}
 }
 
 // goVersions returns Golang stable version.
@@ -198,3 +215,24 @@ func goVersions() (stable, stableMM, k8sVersion string, err error) {
 	stableMM = strings.Join(mmp[0:2], ".") // <major>.<minor> version
 	return stable, stableMM, k8sVersion, nil
 }
+
+func updateGoHashFile(version string) error {
+	r, err := http.Get(fmt.Sprintf("https://dl.google.com/go/go%s.src.tar.gz.sha256", version))
+	if err != nil {
+		return fmt.Errorf("failed to download golang sha256 file: %v", err)
+	}
+	defer r.Body.Close()
+	sha, err := io.ReadAll(r.Body)
+	if err != nil {
+		return fmt.Errorf("failed to read response body: %v", err)
+	}
+	f, err := os.OpenFile("../../../deploy/iso/minikube-iso/go.hash", os.O_APPEND|os.O_WRONLY, 0644)
+	if err != nil {
+		return fmt.Errorf("failed to open go.hash file: %v", err)
+	}
+	defer f.Close()
+	if _, err := f.WriteString(fmt.Sprintf("sha256  %s  go%s.src.tar.gz\n", sha, version)); err != nil {
+		return fmt.Errorf("failed to write to go.hash file: %v", err)
+	}
+	return nil
+}