Skip to content

Commit

Permalink
Merge pull request #115828 from cpanato/go1201
Browse files Browse the repository at this point in the history
[go] Bump images, dependencies and versions to go 1.20.1
  • Loading branch information
k8s-ci-robot committed Feb 16, 2023
2 parents bce513a + 6523033 commit 5c09c9d
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .go-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.20
1.20.1
2 changes: 1 addition & 1 deletion build/build-image/cross/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.27.0-go1.20-bullseye.0
v1.27.0-go1.20.1-bullseye.0
2 changes: 1 addition & 1 deletion build/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
11 changes: 5 additions & 6 deletions build/dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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=
Expand Down
3 changes: 1 addition & 2 deletions hack/lib/golang.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <<EOF
Detected go version: ${go_version[*]}.
Expand Down
2 changes: 1 addition & 1 deletion staging/publishing/rules.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2062,4 +2062,4 @@ rules:
library: true
recursive-delete-patterns:
- '*/.gitattributes'
default-go-version: 1.20
default-go-version: 1.20.1
2 changes: 1 addition & 1 deletion test/images/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7
DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.20
GOLANG_VERSION=1.20.1
export

ifndef WHAT
Expand Down

0 comments on commit 5c09c9d

Please sign in to comment.