scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-10-31 10:18:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

[go] Bump images, dependencies and versions to go 1.20.1

Browse Source 
Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
cpanato
2023-02-16 13:38:32 +01:00
parent 77af0be42f
commit 65230338ad
7 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.go-version
View File

@@ -1 +1 @@
1.20 1.20.1

2
build/build-image/cross/VERSION
View File

@@ -1 +1 @@
v1.27.0-go1.20-bullseye.0 v1.27.0-go1.20.1-bullseye.0

2
build/common.sh
View File

@@ -96,7 +96,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
# These are the default versions (image tags) for their respective base images. # These are the default versions (image tags) for their respective base images.
readonly __default_distroless_iptables_version=v0.1.2 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 readonly __default_setcap_version=bullseye-v1.3.0
# These are the base images for the Docker-wrapped binaries. # These are the base images for the Docker-wrapped binaries.

11
build/dependencies.yaml
View File

@@ -95,7 +95,7 @@ dependencies:
# Golang # Golang
- name: "golang: upstream version" - name: "golang: upstream version"
version: 1.20 version: 1.20.1
refPaths: refPaths:
- path: .go-version - path: .go-version
- path: build/build-image/cross/VERSION - path: build/build-image/cross/VERSION
@@ -113,12 +113,11 @@ dependencies:
version: 1.20 version: 1.20
refPaths: refPaths:
- path: build/build-image/cross/VERSION - 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
# - path: hack/lib/golang.sh match: minimum_go_version=go([0-9]+\.[0-9]+)
# match: minimum_go_version=go([0-9]+\.[0-9]+)
- name: "registry.k8s.io/kube-cross: dependents" - 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: refPaths:
- path: build/build-image/cross/VERSION - 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]+)"} match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
- name: "registry.k8s.io/go-runner: dependents" - 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: refPaths:
- path: build/common.sh - path: build/common.sh
match: __default_go_runner_version= match: __default_go_runner_version=

3
hack/lib/golang.sh
View File

@@ -490,8 +490,7 @@ EOF
local go_version local go_version
IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)" IFS=" " read -ra go_version <<< "$(GOFLAGS='' go version)"
local minimum_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.20
minimum_go_version=go1.19
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 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 kube::log::usage_from_stdin <<EOF
Detected go version: ${go_version[*]}. Detected go version: ${go_version[*]}.

2
staging/publishing/rules.yaml
View File

@@ -2062,4 +2062,4 @@ rules:
library: true library: true
recursive-delete-patterns: recursive-delete-patterns:
- '*/.gitattributes' - '*/.gitattributes'
default-go-version: 1.20 default-go-version: 1.20.1

2
test/images/Makefile
View File

@@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
GOARM ?= 7 GOARM ?= 7
DOCKER_CERT_BASE_PATH ?= DOCKER_CERT_BASE_PATH ?=
QEMUVERSION=v5.1.0-2 QEMUVERSION=v5.1.0-2
GOLANG_VERSION=1.20 GOLANG_VERSION=1.20.1
export export
ifndef WHAT ifndef WHAT