Skip to content

Commit 86434c4

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #17828 from ameukam/bump-containerd
Bump containerd to 2.1.6
2 parents a8c21a7 + ab19afd commit 86434c4

File tree

421 files changed

+1363
-1363
lines changed

Some content is hidden

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

421 files changed

+1363
-1363
lines changed

‎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.29")
50+
containerd.Version = fi.PtrTo("1.7.30")
5151
containerd.Runc = &kops.Runc{
52-
Version: fi.PtrTo("1.3.3"),
52+
Version: fi.PtrTo("1.3.4"),
5353
}
5454
default:
55-
containerd.Version = fi.PtrTo("2.1.5")
55+
containerd.Version = fi.PtrTo("2.1.6")
5656
containerd.Runc = &kops.Runc{
57-
Version: fi.PtrTo("1.3.3"),
57+
Version: fi.PtrTo("1.3.4"),
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: 4FsMJUPpCskYe/WSBBYJzG5fDDwR/+FuUiK5I3BKJRE=
129+
NodeupConfigHash: dkXZBrrumEa7DTwG1izWROg+0h3q1/F56jXUVWiTjnA=
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: s981yzKsF5H3CXcH+D2qycdcNTE1JHXeArtHJT831js=
152+
NodeupConfigHash: w4py9AwVU1ylgAxErci9Z2Av6BpGW/JBm2fMV2SWRpE=
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.3
30+
version: 1.3.4
3131
sandboxImage: registry.k8s.io/pause:3.10.1
32-
version: 2.1.5
32+
version: 2.1.6
3333
dnsZone: Z1AFAKE1ZON3YO
3434
etcdClusters:
3535
- backups:

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -61,17 +61,17 @@ Assets:
6161
- cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl
6262
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
6363
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
64-
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
65-
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
64+
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
65+
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
6666
- 86189e1e8de9692eb02daf2f06db8495f687ce2c4ba09a6b64f135990dfb315d@https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/amd64/protokube,https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/protokube-linux-amd64
6767
- 0172d3c560aebe1eb4e8599f71c0d8fc68e4eca880add8031de41c8057ca8e3c@https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/amd64/channels,https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/channels-linux-amd64
6868
arm64:
6969
- e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet
7070
- 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl
7171
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
7272
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
73-
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
74-
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
73+
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
74+
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
7575
- 25b57b0555fad42e5762246334681bf1c943794fcecdb680a79e482be5c08815@https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/arm64/protokube,https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/protokube-linux-arm64
7676
- 04470f8313796032fce85b974da4fc26420f36931e574fff6d117d21caf22770@https://artifacts.k8s.io/binaries/kops/1.34.0-beta.1/linux/arm64/channels,https://github.com/kubernetes/kops/releases/download/v1.34.0-beta.1/channels-linux-arm64
7777
CAs:
@@ -313,9 +313,9 @@ configStore:
313313
containerdConfig:
314314
logLevel: info
315315
runc:
316-
version: 1.3.3
316+
version: 1.3.4
317317
sandboxImage: registry.k8s.io/pause:3.10.1
318-
version: 2.1.5
318+
version: 2.1.6
319319
etcdManifests:
320320
- memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml
321321
- memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml

‎tests/integration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,15 @@ Assets:
44
- cfda68cba5848bc3b6c6135ae2f20ba2c78de20059f68789c090166d6abc3e2c@https://dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/amd64/kubectl
55
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
66
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
7-
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
8-
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
7+
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
8+
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
99
arm64:
1010
- e45a7795391cd62ee226666039153832d3096c0f892266cd968936e18b2b40b0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubelet
1111
- 00b182d103a8a73da7a4d11e7526d0543dcf352f06cc63a1fde25ce9243f49a0@https://dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl,https://cdn.dl.k8s.io/release/v1.34.0/bin/linux/arm64/kubectl
1212
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
1313
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
14-
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
15-
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
14+
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
15+
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
1616
CAs: {}
1717
ClusterName: additionalobjects.example.com
1818
Hooks:
@@ -52,8 +52,8 @@ UpdatePolicy: automatic
5252
containerdConfig:
5353
logLevel: info
5454
runc:
55-
version: 1.3.3
55+
version: 1.3.4
5656
sandboxImage: registry.k8s.io/pause:3.10.1
57-
version: 2.1.5
57+
version: 2.1.6
5858
usesLegacyGossip: false
5959
usesNoneDNS: false

‎tests/integration/update_cluster/apiservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ClusterName: minimal.example.com
126126
ConfigBase: memfs://clusters.example.com/minimal.example.com
127127
InstanceGroupName: apiserver
128128
InstanceGroupRole: APIServer
129-
NodeupConfigHash: l3nRkswFLRJz9+NSsfUxRBp41qhFPduoW+oCvAtzV6w=
129+
NodeupConfigHash: EIgkLnJl3U4EFzyXuQ5gXvjha35bzV6n1ylj6GjlSHw=
130130
131131
__EOF_KUBE_ENV
132132

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ClusterName: minimal.example.com
126126
ConfigBase: memfs://clusters.example.com/minimal.example.com
127127
InstanceGroupName: master-us-test-1a
128128
InstanceGroupRole: ControlPlane
129-
NodeupConfigHash: jPAqMDLK/1OIx7dm3l4OXToMzXjL6p9o+fS1vFV2ZPI=
129+
NodeupConfigHash: CPRkAF/qdlfj00w9Ksu6UDeWMHXgS3gBDb7k7F3zeHQ=
130130
131131
__EOF_KUBE_ENV
132132

‎tests/integration/update_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.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.minimal.example.com:3988/
150150
InstanceGroupName: nodes
151151
InstanceGroupRole: Node
152-
NodeupConfigHash: PR9VyDzo3oOm2vgery8NE94oD/ZmJoaTUVDUQhxMRnM=
152+
NodeupConfigHash: dvk17VbpNYHsTCWmbiB9wPkSbHwqjhPgKHinq7FLCUw=
153153
154154
__EOF_KUBE_ENV
155155

‎tests/integration/update_cluster/apiservernodes/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.3
30+
version: 1.3.4
3131
sandboxImage: registry.k8s.io/pause:3.10.1
32-
version: 2.1.5
32+
version: 2.1.6
3333
dnsZone: Z1AFAKE1ZON3YO
3434
etcdClusters:
3535
- backups:

0 commit comments

Comments
 (0)