Skip to content

Commit 1366f1f

Browse files
cpanatocpanato
committed
[go] Bump images, dependencies and versions to go 1.22.2 and distroless iptables
Signed-off-by: cpanato <[email protected]>
1 parent d9c54f6 commit 1366f1f

File tree

7 files changed

+41
-41
lines changed

7 files changed

+41
-41
lines changed

‎.go-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.22.1
1+
1.22.2

‎build/build-image/cross/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.30.0-go1.22.1-bullseye.0
1+
v1.30.0-go1.22.2-bullseye.0

‎build/common.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ readonly KUBE_RSYNC_PORT="${KUBE_RSYNC_PORT:-}"
9797
readonly KUBE_CONTAINER_RSYNC_PORT=8730
9898

9999
# These are the default versions (image tags) for their respective base images.
100-
readonly __default_distroless_iptables_version=v0.5.2
101-
readonly __default_go_runner_version=v2.3.1-go1.22.1-bookworm.0
100+
readonly __default_distroless_iptables_version=v0.5.3
101+
readonly __default_go_runner_version=v2.3.1-go1.22.2-bookworm.0
102102
readonly __default_setcap_version=bookworm-v1.0.2
103103

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

‎build/dependencies.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ dependencies:
116116

117117
# Golang
118118
- name: "golang: upstream version"
119-
version: 1.22.1
119+
version: 1.22.2
120120
refPaths:
121121
- path: .go-version
122122
- path: build/build-image/cross/VERSION
@@ -138,7 +138,7 @@ dependencies:
138138
match: minimum_go_version=go([0-9]+\.[0-9]+)
139139

140140
- name: "registry.k8s.io/kube-cross: dependents"
141-
version: v1.30.0-go1.22.1-bullseye.0
141+
version: v1.30.0-go1.22.2-bullseye.0
142142
refPaths:
143143
- path: build/build-image/cross/VERSION
144144

@@ -176,15 +176,15 @@ dependencies:
176176
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-]+)*))?)
177177

178178
- name: "registry.k8s.io/distroless-iptables: dependents"
179-
version: v0.5.2
179+
version: v0.5.3
180180
refPaths:
181181
- path: build/common.sh
182182
match: __default_distroless_iptables_version=
183183
- path: test/utils/image/manifest.go
184184
match: configs\[DistrolessIptables\] = Config{list\.BuildImageRegistry, "distroless-iptables", "v([0-9]+)\.([0-9]+)\.([0-9]+)"}
185185

186186
- name: "registry.k8s.io/go-runner: dependents"
187-
version: v2.3.1-go1.22.1-bookworm.0
187+
version: v2.3.1-go1.22.2-bookworm.0
188188
refPaths:
189189
- path: build/common.sh
190190
match: __default_go_runner_version=

‎staging/publishing/rules.yaml

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ rules:
3131
dirs:
3232
- staging/src/k8s.io/apimachinery
3333
- name: release-1.30
34-
go: 1.22.1
34+
go: 1.22.2
3535
source:
3636
branch: release-1.30
3737
dirs:
@@ -84,7 +84,7 @@ rules:
8484
dirs:
8585
- staging/src/k8s.io/api
8686
- name: release-1.30
87-
go: 1.22.1
87+
go: 1.22.2
8888
dependencies:
8989
- repository: apimachinery
9090
branch: release-1.30
@@ -170,7 +170,7 @@ rules:
170170
go build -mod=mod ./...
171171
go test -mod=mod ./...
172172
- name: release-1.30
173-
go: 1.22.1
173+
go: 1.22.2
174174
dependencies:
175175
- repository: apimachinery
176176
branch: release-1.30
@@ -220,7 +220,7 @@ rules:
220220
dirs:
221221
- staging/src/k8s.io/code-generator
222222
- name: release-1.30
223-
go: 1.22.1
223+
go: 1.22.2
224224
dependencies:
225225
- repository: apimachinery
226226
branch: release-1.30
@@ -295,7 +295,7 @@ rules:
295295
dirs:
296296
- staging/src/k8s.io/component-base
297297
- name: release-1.30
298-
go: 1.22.1
298+
go: 1.22.2
299299
dependencies:
300300
- repository: apimachinery
301301
branch: release-1.30
@@ -375,7 +375,7 @@ rules:
375375
dirs:
376376
- staging/src/k8s.io/component-helpers
377377
- name: release-1.30
378-
go: 1.22.1
378+
go: 1.22.2
379379
dependencies:
380380
- repository: apimachinery
381381
branch: release-1.30
@@ -440,7 +440,7 @@ rules:
440440
dirs:
441441
- staging/src/k8s.io/kms
442442
- name: release-1.30
443-
go: 1.22.1
443+
go: 1.22.2
444444
dependencies:
445445
- repository: apimachinery
446446
branch: release-1.30
@@ -536,7 +536,7 @@ rules:
536536
dirs:
537537
- staging/src/k8s.io/apiserver
538538
- name: release-1.30
539-
go: 1.22.1
539+
go: 1.22.2
540540
dependencies:
541541
- repository: apimachinery
542542
branch: release-1.30
@@ -660,7 +660,7 @@ rules:
660660
dirs:
661661
- staging/src/k8s.io/kube-aggregator
662662
- name: release-1.30
663-
go: 1.22.1
663+
go: 1.22.2
664664
dependencies:
665665
- repository: apimachinery
666666
branch: release-1.30
@@ -812,7 +812,7 @@ rules:
812812
# assumes GO111MODULE=on
813813
go build -mod=mod .
814814
- name: release-1.30
815-
go: 1.22.1
815+
go: 1.22.2
816816
dependencies:
817817
- repository: apimachinery
818818
branch: release-1.30
@@ -939,7 +939,7 @@ rules:
939939
# assumes GO111MODULE=on
940940
go build -mod=mod .
941941
- name: release-1.30
942-
go: 1.22.1
942+
go: 1.22.2
943943
dependencies:
944944
- repository: apimachinery
945945
branch: release-1.30
@@ -1075,7 +1075,7 @@ rules:
10751075
required-packages:
10761076
- k8s.io/code-generator
10771077
- name: release-1.30
1078-
go: 1.22.1
1078+
go: 1.22.2
10791079
dependencies:
10801080
- repository: apimachinery
10811081
branch: release-1.30
@@ -1174,7 +1174,7 @@ rules:
11741174
dirs:
11751175
- staging/src/k8s.io/metrics
11761176
- name: release-1.30
1177-
go: 1.22.1
1177+
go: 1.22.2
11781178
dependencies:
11791179
- repository: apimachinery
11801180
branch: release-1.30
@@ -1256,7 +1256,7 @@ rules:
12561256
dirs:
12571257
- staging/src/k8s.io/cli-runtime
12581258
- name: release-1.30
1259-
go: 1.22.1
1259+
go: 1.22.2
12601260
dependencies:
12611261
- repository: api
12621262
branch: release-1.30
@@ -1346,7 +1346,7 @@ rules:
13461346
dirs:
13471347
- staging/src/k8s.io/sample-cli-plugin
13481348
- name: release-1.30
1349-
go: 1.22.1
1349+
go: 1.22.2
13501350
dependencies:
13511351
- repository: api
13521352
branch: release-1.30
@@ -1437,7 +1437,7 @@ rules:
14371437
dirs:
14381438
- staging/src/k8s.io/kube-proxy
14391439
- name: release-1.30
1440-
go: 1.22.1
1440+
go: 1.22.2
14411441
dependencies:
14421442
- repository: apimachinery
14431443
branch: release-1.30
@@ -1484,7 +1484,7 @@ rules:
14841484
dirs:
14851485
- staging/src/k8s.io/cri-api
14861486
- name: release-1.30
1487-
go: 1.22.1
1487+
go: 1.22.2
14881488
source:
14891489
branch: release-1.30
14901490
dirs:
@@ -1585,7 +1585,7 @@ rules:
15851585
dirs:
15861586
- staging/src/k8s.io/kubelet
15871587
- name: release-1.30
1588-
go: 1.22.1
1588+
go: 1.22.2
15891589
dependencies:
15901590
- repository: apimachinery
15911591
branch: release-1.30
@@ -1683,7 +1683,7 @@ rules:
16831683
dirs:
16841684
- staging/src/k8s.io/kube-scheduler
16851685
- name: release-1.30
1686-
go: 1.22.1
1686+
go: 1.22.2
16871687
dependencies:
16881688
- repository: apimachinery
16891689
branch: release-1.30
@@ -1795,7 +1795,7 @@ rules:
17951795
dirs:
17961796
- staging/src/k8s.io/controller-manager
17971797
- name: release-1.30
1798-
go: 1.22.1
1798+
go: 1.22.2
17991799
dependencies:
18001800
- repository: api
18011801
branch: release-1.30
@@ -1931,7 +1931,7 @@ rules:
19311931
dirs:
19321932
- staging/src/k8s.io/cloud-provider
19331933
- name: release-1.30
1934-
go: 1.22.1
1934+
go: 1.22.2
19351935
dependencies:
19361936
- repository: api
19371937
branch: release-1.30
@@ -2081,7 +2081,7 @@ rules:
20812081
dirs:
20822082
- staging/src/k8s.io/kube-controller-manager
20832083
- name: release-1.30
2084-
go: 1.22.1
2084+
go: 1.22.2
20852085
dependencies:
20862086
- repository: apimachinery
20872087
branch: release-1.30
@@ -2163,7 +2163,7 @@ rules:
21632163
dirs:
21642164
- staging/src/k8s.io/cluster-bootstrap
21652165
- name: release-1.30
2166-
go: 1.22.1
2166+
go: 1.22.2
21672167
dependencies:
21682168
- repository: apimachinery
21692169
branch: release-1.30
@@ -2231,7 +2231,7 @@ rules:
22312231
dirs:
22322232
- staging/src/k8s.io/csi-translation-lib
22332233
- name: release-1.30
2234-
go: 1.22.1
2234+
go: 1.22.2
22352235
dependencies:
22362236
- repository: api
22372237
branch: release-1.30
@@ -2274,7 +2274,7 @@ rules:
22742274
dirs:
22752275
- staging/src/k8s.io/mount-utils
22762276
- name: release-1.30
2277-
go: 1.22.1
2277+
go: 1.22.2
22782278
source:
22792279
branch: release-1.30
22802280
dirs:
@@ -2411,7 +2411,7 @@ rules:
24112411
dirs:
24122412
- staging/src/k8s.io/legacy-cloud-providers
24132413
- name: release-1.30
2414-
go: 1.22.1
2414+
go: 1.22.2
24152415
dependencies:
24162416
- repository: api
24172417
branch: release-1.30
@@ -2553,7 +2553,7 @@ rules:
25532553
dirs:
25542554
- staging/src/k8s.io/kubectl
25552555
- name: release-1.30
2556-
go: 1.22.1
2556+
go: 1.22.2
25572557
dependencies:
25582558
- repository: api
25592559
branch: release-1.30
@@ -2673,7 +2673,7 @@ rules:
26732673
dirs:
26742674
- staging/src/k8s.io/pod-security-admission
26752675
- name: release-1.30
2676-
go: 1.22.1
2676+
go: 1.22.2
26772677
dependencies:
26782678
- repository: api
26792679
branch: release-1.30
@@ -2793,7 +2793,7 @@ rules:
27932793
dirs:
27942794
- staging/src/k8s.io/dynamic-resource-allocation
27952795
- name: release-1.30
2796-
go: 1.22.1
2796+
go: 1.22.2
27972797
dependencies:
27982798
- repository: apimachinery
27992799
branch: release-1.30
@@ -2862,7 +2862,7 @@ rules:
28622862
dirs:
28632863
- staging/src/k8s.io/endpointslice
28642864
- name: release-1.30
2865-
go: 1.22.1
2865+
go: 1.22.2
28662866
dependencies:
28672867
- repository: api
28682868
branch: release-1.30
@@ -2878,4 +2878,4 @@ rules:
28782878
- staging/src/k8s.io/endpointslice
28792879
recursive-delete-patterns:
28802880
- '*/.gitattributes'
2881-
default-go-version: 1.22.1
2881+
default-go-version: 1.22.2

‎test/images/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ REGISTRY ?= registry.k8s.io/e2e-test-images
1616
GOARM ?= 7
1717
DOCKER_CERT_BASE_PATH ?=
1818
QEMUVERSION=v5.1.0-2
19-
GOLANG_VERSION=1.22.1
19+
GOLANG_VERSION=1.22.2
2020
export
2121

2222
ifndef WHAT

‎test/utils/image/manifest.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,7 @@ func initImageConfigs(list RegistryList) (map[ImageID]Config, map[ImageID]Config
237237
configs[BusyBox] = Config{list.PromoterE2eRegistry, "busybox", "1.36.1-1"}
238238
configs[CudaVectorAdd] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "1.0"}
239239
configs[CudaVectorAdd2] = Config{list.PromoterE2eRegistry, "cuda-vector-add", "2.3"}
240-
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.2"}
240+
configs[DistrolessIptables] = Config{list.BuildImageRegistry, "distroless-iptables", "v0.5.3"}
241241
configs[Etcd] = Config{list.GcEtcdRegistry, "etcd", "3.5.12-0"}
242242
configs[Httpd] = Config{list.PromoterE2eRegistry, "httpd", "2.4.38-4"}
243243
configs[HttpdNew] = Config{list.PromoterE2eRegistry, "httpd", "2.4.39-4"}

0 commit comments

Comments
 (0)