Skip to content

Commit 6ba7258

Browse files
authored
Merge pull request kubernetes#121808 from cpanato/go-update-main
[go] Bump images, dependencies and versions to go 1.21.4
2 parents 8e1e957 + 9e5b840 commit 6ba7258

File tree

40 files changed

+69
-69
lines changed

40 files changed

+69
-69
lines changed

.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.21.3
1+
1.21.4

build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.29.0-go1.21.3-bullseye.0
1+
v1.29.0-go1.21.4-bullseye.0

build/common.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ readonly KUBE_CONTAINER_RSYNC_PORT=8730
9797

9898
# These are the default versions (image tags) for their respective base images.
9999
readonly __default_distroless_iptables_version=v0.4.1
100-
readonly __default_go_runner_version=v2.3.1-go1.21.3-bookworm.0
100+
readonly __default_go_runner_version=v2.3.1-go1.21.4-bookworm.0
101101
readonly __default_setcap_version=bookworm-v1.0.0
102102

103103
# These are the base images for the Docker-wrapped binaries.

build/dependencies.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ dependencies:
118118

119119
# Golang
120120
- name: "golang: upstream version"
121-
version: 1.21.3
121+
version: 1.21.4
122122
refPaths:
123123
- path: .go-version
124124
- path: build/build-image/cross/VERSION
@@ -140,7 +140,7 @@ dependencies:
140140
match: minimum_go_version=go([0-9]+\.[0-9]+)
141141

142142
- name: "registry.k8s.io/kube-cross: dependents"
143-
version: v1.29.0-go1.21.3-bullseye.0
143+
version: v1.29.0-go1.21.4-bullseye.0
144144
refPaths:
145145
- path: build/build-image/cross/VERSION
146146

@@ -186,7 +186,7 @@ dependencies:
186186
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
187187

188188
- name: "registry.k8s.io/go-runner: dependents"
189-
version: v2.3.1-go1.21.3-bookworm.0
189+
version: v2.3.1-go1.21.4-bookworm.0
190190
refPaths:
191191
- path: build/common.sh
192192
match: __default_go_runner_version=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
module k8s.io/kubernetes
88

9-
go 1.21.3
9+
go 1.21
1010

1111
require (
1212
bitbucket.org/bertimus9/systemstat v0.5.0

staging/publishing/rules.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2327,4 +2327,4 @@ rules:
23272327
- staging/src/k8s.io/endpointslice
23282328
recursive-delete-patterns:
23292329
- '*/.gitattributes'
2330-
default-go-version: 1.21.3
2330+
default-go-version: 1.21.4

staging/src/k8s.io/api/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module k8s.io/api
44

5-
go 1.21.3
5+
go 1.21
66

77
require (
88
github.com/gogo/protobuf v1.3.2

staging/src/k8s.io/apiextensions-apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module k8s.io/apiextensions-apiserver
44

5-
go 1.21.3
5+
go 1.21
66

77
require (
88
github.com/emicklei/go-restful/v3 v3.11.0

staging/src/k8s.io/apimachinery/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module k8s.io/apimachinery
44

5-
go 1.21.3
5+
go 1.21
66

77
require (
88
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5

staging/src/k8s.io/apiserver/go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
module k8s.io/apiserver
44

5-
go 1.21.3
5+
go 1.21
66

77
require (
88
github.com/coreos/go-oidc v2.2.1+incompatible

0 commit comments

Comments
 (0)