mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-19 18:02:01 +00:00
golang: Update to 1.19rc2 from 1.18.3
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
This commit is contained in:
parent
6c0a434db0
commit
4784b58e17
@ -1 +1 @@
|
|||||||
v1.25.0-go1.18.3-bullseye.0
|
v1.25.0-go1.19rc2-bullseye.0
|
||||||
|
@ -91,7 +91,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.1
|
readonly __default_distroless_iptables_version=v0.1.1
|
||||||
readonly __default_go_runner_version=v2.3.1-go1.18.3-bullseye.0
|
readonly __default_go_runner_version=v2.3.1-go1.19rc2-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.
|
||||||
|
@ -88,7 +88,7 @@ dependencies:
|
|||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.18.3
|
version: 1.19rc2
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: staging/publishing/rules.yaml
|
- path: staging/publishing/rules.yaml
|
||||||
@ -102,15 +102,15 @@ dependencies:
|
|||||||
# This entry is a stub of the major version to allow dependency checks to
|
# This entry is a stub of the major version to allow dependency checks to
|
||||||
# pass when building Kubernetes using a pre-release of Golang.
|
# pass when building Kubernetes using a pre-release of Golang.
|
||||||
- name: "golang: 1.<major>"
|
- name: "golang: 1.<major>"
|
||||||
version: 1.18
|
version: 1.19rc2
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
# TODO(dims): Uncomment once images are updated to go1.18
|
# TODO(dims): Uncomment once images are updated to go1.19
|
||||||
#- 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.25.0-go1.18.3-bullseye.0
|
version: v1.25.0-go1.19rc2-bullseye.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
|
|
||||||
@ -140,7 +140,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.18.3-bullseye.0
|
version: v2.3.1-go1.19rc2-bullseye.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_go_runner_version=
|
match: __default_go_runner_version=
|
||||||
|
@ -482,6 +482,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(dims): Need to switch this to 1.19 once we update images to newer go version
|
||||||
minimum_go_version=go1.18.1
|
minimum_go_version=go1.18.1
|
||||||
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
|
||||||
|
@ -1929,4 +1929,4 @@ recursive-delete-patterns:
|
|||||||
- '*/BUILD.bazel'
|
- '*/BUILD.bazel'
|
||||||
- Gopkg.toml
|
- Gopkg.toml
|
||||||
- '*/.gitattributes'
|
- '*/.gitattributes'
|
||||||
default-go-version: 1.18.3
|
default-go-version: 1.19rc2
|
||||||
|
@ -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.18.3
|
GOLANG_VERSION=1.19rc2
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
Loading…
Reference in New Issue
Block a user