diff --git a/.go-version b/.go-version index fa994bd7197..53cc1a6f929 100644 --- a/.go-version +++ b/.go-version @@ -1 +1 @@ -1.23.6 \ No newline at end of file +1.24.0 diff --git a/build/build-image/cross/VERSION b/build/build-image/cross/VERSION index 577410caadf..8f02aa6952d 100644 --- a/build/build-image/cross/VERSION +++ b/build/build-image/cross/VERSION @@ -1 +1 @@ -v1.33.0-go1.23.6-bullseye.0 +v1.33.0-go1.24.0-bullseye.0 diff --git a/build/common.sh b/build/common.sh index ef44ce99f27..0585cebc914 100755 --- a/build/common.sh +++ b/build/common.sh @@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}" readonly KUBE_CONTAINER_RSYNC_PORT=8730 # These are the default versions (image tags) for their respective base images. -readonly __default_distroless_iptables_version=v0.6.8 -readonly __default_go_runner_version=v2.4.0-go1.23.6-bookworm.0 +readonly __default_distroless_iptables_version=v0.7.3 +readonly __default_go_runner_version=v2.4.0-go1.24.0-bookworm.0 readonly __default_setcap_version=bookworm-v1.0.4 # These are the base images for the Docker-wrapped binaries. diff --git a/build/dependencies.yaml b/build/dependencies.yaml index 2cad9ccb226..ac32cb5b5e4 100644 --- a/build/dependencies.yaml +++ b/build/dependencies.yaml @@ -116,7 +116,7 @@ dependencies: # Golang - name: "golang: upstream version" - version: 1.23.6 + version: 1.24.0 refPaths: - path: .go-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 # pass when building Kubernetes using a pre-release of Golang. + - name: "golang: 1." - version: 1.23 + version: 1.24 refPaths: - path: build/build-image/cross/VERSION - path: hack/lib/golang.sh @@ -140,7 +141,7 @@ dependencies: match: golang:([0-9]+\.[0-9]+).0-bullseye - 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: - 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-]+)*))?) - name: "registry.k8s.io/distroless-iptables: dependents" - version: v0.6.8 + version: v0.7.3 refPaths: - path: build/common.sh 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]+)"} - 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: - path: build/common.sh match: __default_go_runner_version= diff --git a/hack/lib/golang.sh b/hack/lib/golang.sh index 3a20da92e42..b2e202e70e7 100755 --- a/hack/lib/golang.sh +++ b/hack/lib/golang.sh @@ -508,7 +508,7 @@ kube::golang::set_platform_envs() { # if CC is defined for platform then always enable it 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 CC="${!ccenv}" fi @@ -551,7 +551,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(GOFLAGS='' 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 kube::log::usage_from_stdin <