Skip to content

Commit 6e75cb6

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #18364 from hakman/containerd-2.3.0
Upgrade containerd to v2.3.0
2 parents 6ca9207 + 4d1618f commit 6e75cb6

465 files changed

Lines changed: 1545 additions & 1487 deletions

File tree

Some content is hidden

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

‎hack/generate-asset-hashes.sh‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,14 +173,15 @@ generate_k8s_hashes 1.35 2
173173
# The first argument is the major and minor version, the second is the maximum patch version.
174174
generate_runc_hashes 1.1 15
175175
generate_runc_hashes 1.2 8
176-
generate_runc_hashes 1.3 4
177-
generate_runc_hashes 1.4 0
176+
generate_runc_hashes 1.3 5
177+
generate_runc_hashes 1.4 2
178178

179179
# Generate containerd hashes.
180-
generate_containerd_hashes 1.7 30
180+
generate_containerd_hashes 1.7 31
181181
generate_containerd_hashes 2.0 7
182-
generate_containerd_hashes 2.1 6
183-
generate_containerd_hashes 2.2 1
182+
generate_containerd_hashes 2.1 7
183+
generate_containerd_hashes 2.2 3
184+
generate_containerd_hashes 2.3 0
184185

185186
# Generate CNI network plugins hashes.
186187
# Note: argument is now base path and list of versions (because there is no 1.6.1)

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,8 @@ files:
159159
sha256: ca0f27e34411504acd1cd24fcbaa71b9c47d31ce9408c47c54a2dc1810ceb1df
160160
- name: v1.7.30/containerd-1.7.30-linux-arm64.tar.gz
161161
sha256: a09c3b01b3b6935e839c8a9588b5528c57ebfca4747d816654a7d1e7575c0a63
162+
# containerd 1.7.31
163+
- name: v1.7.31/containerd-1.7.31-linux-amd64.tar.gz
164+
sha256: 85795979166ae04c6c0681664ab54d0810d472e390cf54dde0de399ff6d54bef
165+
- name: v1.7.31/containerd-1.7.31-linux-arm64.tar.gz
166+
sha256: d375de285eaaa5a3a58c0b03d92aff6bfa7987657781bce8cd5d30335f9aa2a6

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,8 @@ files:
3939
sha256: 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d
4040
- name: v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
4141
sha256: 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e
42+
# containerd 2.1.7
43+
- name: v2.1.7/containerd-2.1.7-linux-amd64.tar.gz
44+
sha256: a04a39607d6a54f467c93fcd0b78ee31a1f4a3b90e76938dcfe9005ccf6a5f36
45+
- name: v2.1.7/containerd-2.1.7-linux-arm64.tar.gz
46+
sha256: 5e6a05fc6990912f856fab297bee13b6ba83ff4e9b6b3bc507da33da8c1f5b5f

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,13 @@ files:
1414
sha256: f5d8e90ecb6c1c7e33ecddf8cc268a93b9e5b54e0e850320d765511d76624f41
1515
- name: v2.2.1/containerd-2.2.1-linux-arm64.tar.gz
1616
sha256: dac15a0d412a24be8bfe6a40cec8f51829062725169f1e72ac7d120a891ef5b6
17+
# containerd 2.2.2
18+
- name: v2.2.2/containerd-2.2.2-linux-amd64.tar.gz
19+
sha256: 2c08c99cbde73b3388c6d5da68e0bcaebc70c9174f2b14d785695e4401b3ede0
20+
- name: v2.2.2/containerd-2.2.2-linux-arm64.tar.gz
21+
sha256: cb102473d6e353beb604178879d51cc456da0cdf368d9437d8d404ed01baf674
22+
# containerd 2.2.3
23+
- name: v2.2.3/containerd-2.2.3-linux-amd64.tar.gz
24+
sha256: ca26ef5138f17b847bbeeec36d4bf5e002b54d25858197a870c125d57f44d32f
25+
- name: v2.2.3/containerd-2.2.3-linux-arm64.tar.gz
26+
sha256: 2942d72435b18610f7b69c1ddb74f99cef5c549425ff80d3e74f04e5e80db6a4

‎pkg/assets/assetdata/containerd-2.3.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.3.0
8+
- name: v2.3.0/containerd-2.3.0-linux-amd64.tar.gz
9+
sha256: 4cb83e7100a5e73fcb626207d0b5bcfd1294e26aeddfe075dcfb38f375c5f887
10+
- name: v2.3.0/containerd-2.3.0-linux-arm64.tar.gz
11+
sha256: 06623dc8719b30d06303420f7eae91b0a9ade4e71243a4102f6375e585fb0a42

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@ files:
3737
sha256: 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103
3838
- name: v1.3.4/runc.arm64
3939
sha256: d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428
40+
# runc 1.3.5
41+
- name: v1.3.5/SHA512
42+
sha256: 'Hash:'
43+
- name: v1.3.5/runc.amd64
44+
sha256: 66fa8390be8fb3b23dfbb60c767368bb5b51f1acfa88692bbff1a82953d4d9e9
45+
- name: v1.3.5/runc.arm64
46+
sha256: bd843d75a788e612c9df286b1fa519a44fcbb7a7b8d01e2268431433cc7c718c

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,3 +11,17 @@ files:
1111
sha256: c5d4995c5aec204d7e1827d9d9a6b45042602736f7f415f484252e576dcdac28
1212
- name: v1.4.0/runc.arm64
1313
sha256: 2adbeed4c751d6f2201c642ed06269ff4370fcc4165abd3f323e19c653716c31
14+
# runc 1.4.1
15+
- name: v1.4.1/SHA512
16+
sha256: 'Hash:'
17+
- name: v1.4.1/runc.amd64
18+
sha256: b6d50dad89a420cafcdc0eebf4bed132a45b161d5bc1ba4ddd8cc4422d24a983
19+
- name: v1.4.1/runc.arm64
20+
sha256: 80d5757c46152c35151621cf394ee08cec881716169d0fdd40f9ce124d3c85f5
21+
# runc 1.4.2
22+
- name: v1.4.2/SHA512
23+
sha256: 'Hash:'
24+
- name: v1.4.2/runc.amd64
25+
sha256: ac8a90f9e225bb9322189937b230cdc5478d5753f0e31e1bda98a5cf06bd9539
26+
- name: v1.4.2/runc.arm64
27+
sha256: ea54032310588e115633aa2f4bba8bf9500257f657e1deca88df5778775138db

‎pkg/model/components/containerd.go‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,19 @@ 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.30")
50+
containerd.Version = fi.PtrTo("1.7.31")
5151
containerd.Runc = &kops.Runc{
52-
Version: fi.PtrTo("1.3.4"),
52+
Version: fi.PtrTo("1.3.5"),
53+
}
54+
case b.IsKubernetesLT("1.36"):
55+
containerd.Version = fi.PtrTo("2.2.3")
56+
containerd.Runc = &kops.Runc{
57+
Version: fi.PtrTo("1.3.5"),
5358
}
5459
default:
55-
containerd.Version = fi.PtrTo("2.1.6")
60+
containerd.Version = fi.PtrTo("2.3.0")
5661
containerd.Runc = &kops.Runc{
57-
Version: fi.PtrTo("1.3.4"),
62+
Version: fi.PtrTo("1.4.2"),
5863
}
5964
}
6065
}

‎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: NpxNB7RIbJydu739DjrvD5RI6JD7kO9gqyivY22Al/Q=
129+
NodeupConfigHash: t2n7DtzGc7GDSHMnNu1sypRScrVT3Y/KH72GxJUz/so=
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: DunVvpqrHLP1htnTetpB5gQDturLRPXWwWDjRfprtdY=
152+
NodeupConfigHash: 6K/HJqhENw6zka25UTFj5/p3rRgHzUJXmdKNQhDsQRo=
153153
154154
__EOF_KUBE_ENV
155155

0 commit comments

Comments
 (0)