mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-23 03:41:45 +00:00
Bump images, dependencies and versions to go 1.24.0
Signed-off-by: cpanato <ctadeu@gmail.com>
This commit is contained in:
parent
3d9fcb7c01
commit
597b54720e
@ -1 +1 @@
|
|||||||
1.23.6
|
1.24.0
|
||||||
|
@ -1 +1 @@
|
|||||||
v1.33.0-go1.23.6-bullseye.0
|
v1.33.0-go1.24.0-bullseye.0
|
||||||
|
@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
|
|||||||
readonly KUBE_CONTAINER_RSYNC_PORT=8730
|
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.6.8
|
readonly __default_distroless_iptables_version=v0.7.3
|
||||||
readonly __default_go_runner_version=v2.4.0-go1.23.6-bookworm.0
|
readonly __default_go_runner_version=v2.4.0-go1.24.0-bookworm.0
|
||||||
readonly __default_setcap_version=bookworm-v1.0.4
|
readonly __default_setcap_version=bookworm-v1.0.4
|
||||||
|
|
||||||
# These are the base images for the Docker-wrapped binaries.
|
# These are the base images for the Docker-wrapped binaries.
|
||||||
|
@ -116,7 +116,7 @@ dependencies:
|
|||||||
|
|
||||||
# Golang
|
# Golang
|
||||||
- name: "golang: upstream version"
|
- name: "golang: upstream version"
|
||||||
version: 1.23.6
|
version: 1.24.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: .go-version
|
- path: .go-version
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
@ -130,8 +130,9 @@ 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.23
|
version: 1.24
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
- path: hack/lib/golang.sh
|
- path: hack/lib/golang.sh
|
||||||
@ -140,7 +141,7 @@ dependencies:
|
|||||||
match: golang:([0-9]+\.[0-9]+).0-bullseye
|
match: golang:([0-9]+\.[0-9]+).0-bullseye
|
||||||
|
|
||||||
- name: "registry.k8s.io/kube-cross: dependents"
|
- name: "registry.k8s.io/kube-cross: dependents"
|
||||||
version: v1.33.0-go1.23.6-bullseye.0
|
version: v1.33.0-go1.24.0-bullseye.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/build-image/cross/VERSION
|
- path: build/build-image/cross/VERSION
|
||||||
|
|
||||||
@ -178,7 +179,7 @@ dependencies:
|
|||||||
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
match: registry\.k8s\.io\/build-image\/debian-base:[a-zA-Z]+\-v((([0-9]+)\.([0-9]+)\.([0-9]+)(?:-([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?)
|
||||||
|
|
||||||
- name: "registry.k8s.io/distroless-iptables: dependents"
|
- name: "registry.k8s.io/distroless-iptables: dependents"
|
||||||
version: v0.6.8
|
version: v0.7.3
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_distroless_iptables_version=
|
match: __default_distroless_iptables_version=
|
||||||
@ -186,7 +187,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.4.0-go1.23.6-bookworm.0
|
version: v2.4.0-go1.24.0-bookworm.0
|
||||||
refPaths:
|
refPaths:
|
||||||
- path: build/common.sh
|
- path: build/common.sh
|
||||||
match: __default_go_runner_version=
|
match: __default_go_runner_version=
|
||||||
|
@ -508,7 +508,7 @@ kube::golang::set_platform_envs() {
|
|||||||
|
|
||||||
# if CC is defined for platform then always enable it
|
# if CC is defined for platform then always enable it
|
||||||
ccenv=$(echo "$platform" | awk -F/ '{print "KUBE_" toupper($1) "_" toupper($2) "_CC"}')
|
ccenv=$(echo "$platform" | awk -F/ '{print "KUBE_" toupper($1) "_" toupper($2) "_CC"}')
|
||||||
if [ -n "${!ccenv-}" ]; then
|
if [ -n "${!ccenv-}" ]; then
|
||||||
export CGO_ENABLED=1
|
export CGO_ENABLED=1
|
||||||
export CC="${!ccenv}"
|
export CC="${!ccenv}"
|
||||||
fi
|
fi
|
||||||
@ -551,7 +551,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
|
||||||
minimum_go_version=go1.23
|
minimum_go_version=go1.24
|
||||||
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[*]}.
|
||||||
|
@ -2420,4 +2420,4 @@ rules:
|
|||||||
- staging/src/k8s.io/externaljwt
|
- staging/src/k8s.io/externaljwt
|
||||||
recursive-delete-patterns:
|
recursive-delete-patterns:
|
||||||
- '*/.gitattributes'
|
- '*/.gitattributes'
|
||||||
default-go-version: 1.23.6
|
default-go-version: 1.24.0
|
||||||
|
@ -12,7 +12,7 @@
|
|||||||
# See the License for the specific language governing permissions and
|
# See the License for the specific language governing permissions and
|
||||||
# limitations under the License.
|
# limitations under the License.
|
||||||
|
|
||||||
FROM golang:1.23.0-bullseye as builder
|
FROM golang:1.24.0-bullseye as builder
|
||||||
|
|
||||||
WORKDIR /workspace
|
WORKDIR /workspace
|
||||||
|
|
||||||
|
@ -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.23.6
|
GOLANG_VERSION=1.24.0
|
||||||
export
|
export
|
||||||
|
|
||||||
ifndef WHAT
|
ifndef WHAT
|
||||||
|
@ -223,7 +223,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
|
|||||||
configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"}
|
configs[APIServer] = Config{list.PromoterE2eRegistry, "sample-apiserver", "1.29.2"}
|
||||||
configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
|
configs[AppArmorLoader] = Config{list.PromoterE2eRegistry, "apparmor-loader", "1.4"}
|
||||||
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
|
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
|
||||||
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.6.8"}
|
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.7.3"}
|
||||||
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.17-0"}
|
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.17-0"}
|
||||||
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
|
||||||
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}
|
||||||
|
Loading…
Reference in New Issue
Block a user