diff --git a/.go-version b/.go-version index 0fdd2359fde..1acb46a42ac 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.20 \ No newline at end of file +1.20.1 \ No newline at end of file diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 8de3e2482a6..76822502ada 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.27.0-go1.20-bullseye.0 +v1.27.0-go1.20.1-bullseye.0 diff --git a/build/common.sh b/build/common.sh index b493ed33f01..ab84fca8bd9 100755 --- a/build/common.sh +++ b/build/common.sh @@ -96,7 +96,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. readonly __default_distroless_iptables_version=v0.1.2 -readonly __default_go_runner_version=v2.3.1-go1.20-bullseye.0 +readonly __default_go_runner_version=v2.3.1-go1.20.1-bullseye.0 readonly __default_setcap_version=bullseye-v1.3.0 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index b31c6dcefe9..d5693ad628b 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -95,7 +95,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.20 + version: 1.20.1 refPaths: - path: .go-version - path: build/build-image/cross/VERSION @@ -113,12 +113,11 @@ dependencies: version: 1.20 refPaths: - path: build/build-image/cross/VERSION - # TODO(cpanato): Need to switch this to 1.20 once we update images to newer go version - # - path: hack/lib/golang.sh - # match: minimum_go_version=go([0-9]+\.[0-9]+) + - path: hack/lib/golang.sh + match: minimum_go_version=go([0-9]+\.[0-9]+) - name: "registry.k8s.io/kube-cross: dependents" - version: v1.27.0-go1.20-bullseye.0 + version: v1.27.0-go1.20.1-bullseye.0 refPaths: - path: build/build-image/cross/VERSION @@ -148,7 +147,7 @@ dependencies: match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"} - name: "registry.k8s.io/go-runner: dependents" - version: v2.3.1-go1.20-bullseye.0 + version: v2.3.1-go1.20.1-bullseye.0 refPaths: - path: build/common.sh match: __default_go_runner_version= diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 3b80e922510..76dd7c7881b 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -490,8 +490,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" local minimum_go_version - # TODO(cpanato): Need to switch this to 1.20 once we update images to newer go version - minimum_go_version=go1.19 + minimum_go_version=go1.20 if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then kube::log::usage_from_stdin <