Skip to content

Commit a61627b

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17743 from hakman/containerd-2.1.5
Update containerd to v2.1.5
2 parents 5e57006 + 05adc05 commit a61627b

File tree

427 files changed

+1415
-1367
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

427 files changed

+1415
-1367
lines changed

‎hack/generate-asset-hashes.sh‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,12 +170,13 @@ generate_k8s_hashes 1.34 1
170170
# The first argument is the major and minor version, the second is the maximum patch version.
171171
generate_runc_hashes 1.1 15
172172
generate_runc_hashes 1.2 6
173-
generate_runc_hashes 1.3 0
173+
generate_runc_hashes 1.3 3
174174

175175
# Generate containerd hashes.
176-
generate_containerd_hashes 1.7 28
177-
generate_containerd_hashes 2.0 6
178-
generate_containerd_hashes 2.1 4
176+
generate_containerd_hashes 1.7 29
177+
generate_containerd_hashes 2.0 7
178+
generate_containerd_hashes 2.1 5
179+
generate_containerd_hashes 2.2 0
179180

180181
# Generate CNI network plugins hashes.
181182
generate_cni_hashes 0.9 1

‎pkg/assets/assetdata/containerd-1.7.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -149,3 +149,8 @@ files:
149149
sha256: 7a8c262deb63becc877e82d23749e4f99f4a17e8e660f9b8c257ca87a5c056b6
150150
- name: v1.7.28/containerd-1.7.28-linux-arm64.tar.gz
151151
sha256: 97457594ff8549cb82d664306593cafd3d2c781c706f9fffed885a46d8919bec
152+
# containerd 1.7.29
153+
- name: v1.7.29/containerd-1.7.29-linux-amd64.tar.gz
154+
sha256: 71d9f6e4ea4a9e108e2172b0e7f6fa137e086808db3e6874dbdb91c01102d3d4
155+
- name: v1.7.29/containerd-1.7.29-linux-arm64.tar.gz
156+
sha256: 176d523a6d6dc5520e0c35b8eb0de6e54bd4d00486d5fbbeb4163f30e2962f17

‎pkg/assets/assetdata/containerd-2.0.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,8 @@ files:
3939
sha256: a545471a67b8508a3c58ad01a4e6bb2921ace1e59e00a0a2d2e784c1f4fa8caa
4040
- name: v2.0.6/containerd-2.0.6-linux-arm64.tar.gz
4141
sha256: 0f308f386b1ee24712875f02bded92ce7099a707ed43f57b3fb9c934dcb6bed1
42+
# containerd 2.0.7
43+
- name: v2.0.7/containerd-2.0.7-linux-amd64.tar.gz
44+
sha256: 6dc663cd245d19c3e68260ca86247469563a31decac925087b62a2a819dfcbee
45+
- name: v2.0.7/containerd-2.0.7-linux-arm64.tar.gz
46+
sha256: e590e39956a451ff692454ea991961b08627c514dcc253e8845d2a57f9a78e2f

‎pkg/assets/assetdata/containerd-2.1.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,8 @@ files:
2929
sha256: 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515
3030
- name: v2.1.4/containerd-2.1.4-linux-arm64.tar.gz
3131
sha256: 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e
32+
# containerd 2.1.5
33+
- name: v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
34+
sha256: 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea
35+
- name: v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
36+
sha256: fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca

‎pkg/assets/assetdata/containerd-2.2.yaml‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# This file is generated by generate-asset-hashes.sh
2+
3+
filestores:
4+
- base: https://github.com/containerd/containerd/releases/download/
5+
6+
files:
7+
# containerd 2.2.0
8+
- name: v2.2.0/containerd-2.2.0-linux-amd64.tar.gz
9+
sha256: b9626a94ab93b00bcbcbf13d98deef972c6fb064690e57940632df54ad39ee71
10+
- name: v2.2.0/containerd-2.2.0-linux-arm64.tar.gz
11+
sha256: 8805c2123d3b7c7ee2030e9f8fc07a1167d8a3f871d6a7d7ec5d1deb0b51a4a7

‎pkg/assets/assetdata/runc-1.3.yaml‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,24 @@ files:
99
sha256: 028986516ab5646370edce981df2d8e8a8d12188deaf837142a02097000ae2f2
1010
- name: v1.3.0/runc.arm64
1111
sha256: 85c5e4e4f72e442c8c17bac07527cd4f961ee48e4f2b71797f7533c94f4a52b9
12+
# runc 1.3.1
13+
- name: v1.3.1/SHA512
14+
sha256: 'Hash:'
15+
- name: v1.3.1/runc.amd64
16+
sha256: 53bfce31ca047e537e0767b21c9d529d4b5b3e1cb9c590ca81654f9a5615d80d
17+
- name: v1.3.1/runc.arm64
18+
sha256: e531c276312ec701be7edf2b998ac4220c858d02d274bef5546945964792d074
19+
# runc 1.3.2
20+
- name: v1.3.2/SHA512
21+
sha256: 'Hash:'
22+
- name: v1.3.2/runc.amd64
23+
sha256: e7a8e30bd6d248f494aae9163521ff4eb112a30602ac56ada0871e3531269c2d
24+
- name: v1.3.2/runc.arm64
25+
sha256: 06fbccb4528ecd490f3f333d6dcf22c876bd72a024813a0c0a46312121f4c5fd
26+
# runc 1.3.3
27+
- name: v1.3.3/SHA512
28+
sha256: 'Hash:'
29+
- name: v1.3.3/runc.amd64
30+
sha256: 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543
31+
- name: v1.3.3/runc.arm64
32+
sha256: 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712

‎pkg/model/components/containerd.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o *kops.Cluster) error {
4747
if fi.ValueOf(containerd.Version) == "" {
4848
switch {
4949
case b.IsKubernetesLT("1.32"):
50-
containerd.Version = fi.PtrTo("1.7.28")
50+
containerd.Version = fi.PtrTo("1.7.29")
5151
containerd.Runc = &kops.Runc{
52-
Version: fi.PtrTo("1.3.0"),
52+
Version: fi.PtrTo("1.3.3"),
5353
}
5454
default:
55-
containerd.Version = fi.PtrTo("2.1.4")
55+
containerd.Version = fi.PtrTo("2.1.5")
5656
containerd.Runc = &kops.Runc{
57-
Version: fi.PtrTo("1.3.0"),
57+
Version: fi.PtrTo("1.3.3"),
5858
}
5959
}
6060
}

‎tests/integration/update_cluster/additionalobjects/data/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ClusterName: additionalobjects.example.com
126126
ConfigBase: memfs://tests/additionalobjects.example.com
127127
InstanceGroupName: master-us-test-1a
128128
InstanceGroupRole: ControlPlane
129-
NodeupConfigHash: nw+ll2eb5QHLkuLfR5M9RWGL39KTGX3p3ZwHvUJ+oSs=
129+
NodeupConfigHash: 4FsMJUPpCskYe/WSBBYJzG5fDDwR/+FuUiK5I3BKJRE=
130130
131131
__EOF_KUBE_ENV
132132

‎tests/integration/update_cluster/additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ ConfigServer:
149149
- https://kops-controller.internal.additionalobjects.example.com:3988/
150150
InstanceGroupName: nodes
151151
InstanceGroupRole: Node
152-
NodeupConfigHash: qVAZ1vRHmaWkZw9CSo+lX6N28E+HbtL60vXT+3uV3Nw=
152+
NodeupConfigHash: s981yzKsF5H3CXcH+D2qycdcNTE1JHXeArtHJT831js=
153153
154154
__EOF_KUBE_ENV
155155

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ spec:
2727
containerd:
2828
logLevel: info
2929
runc:
30-
version: 1.3.0
30+
version: 1.3.3
3131
sandboxImage: registry.k8s.io/pause:3.10.1
32-
version: 2.1.4
32+
version: 2.1.5
3333
dnsZone: Z1AFAKE1ZON3YO
3434
etcdClusters:
3535
- backups:

0 commit comments

Comments
 (0)