Skip to content

Bump containerd to 2.1.6 #17828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
k8s-ci-robot merged 2 commits into from
Dec 19, 2025
+1,363 −1,363
Merged

Bump containerd to 2.1.6 #17828

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d64ea2
Bump containerd to 2.1.6 and 1.7.30
ameukam Dec 18, 2025
ab19afd
./hack/update-expected.sh executed
ameukam Dec 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 4 additions & 4 deletions pkg/model/components/containerd.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o *kops.Cluster) error {
if fi.ValueOf(containerd.Version) == "" {
switch {
case b.IsKubernetesLT("1.32"):
containerd.Version = fi.PtrTo("1.7.29")
containerd.Version = fi.PtrTo("1.7.30")
containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.3.3"),
Version: fi.PtrTo("1.3.4"),
}
default:
containerd.Version = fi.PtrTo("2.1.5")
containerd.Version = fi.PtrTo("2.1.6")
Copy link
Member

@hakman hakman Dec 18, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you bump the 1.7.x branch also?

containerd.Runc = &kops.Runc{
Version: fi.PtrTo("1.3.3"),
Version: fi.PtrTo("1.3.4"),
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ata/aws_launch_template_master-us-test-1a.masters.additionalobjects.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ClusterName: additionalobjects.example.com
ConfigBase: memfs://tests/additionalobjects.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: 4FsMJUPpCskYe/WSBBYJzG5fDDwR/+FuUiK5I3BKJRE=
NodeupConfigHash: dkXZBrrumEa7DTwG1izWROg+0h3q1/F56jXUVWiTjnA=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion .../additionalobjects/data/aws_launch_template_nodes.additionalobjects.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ ConfigServer:
- https://kops-controller.internal.additionalobjects.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: s981yzKsF5H3CXcH+D2qycdcNTE1JHXeArtHJT831js=
NodeupConfigHash: w4py9AwVU1ylgAxErci9Z2Av6BpGW/JBm2fMV2SWRpE=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/additionalobjects/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ spec:
containerd:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
12 changes: 6 additions & 6 deletions ...pdate_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ Assets:
- 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
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
- 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
- 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
arm64:
- 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
- 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
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
- 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
- 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
CAs:
Expand Down Expand Up @@ -313,9 +313,9 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
etcdManifests:
- memfs://tests/additionalobjects.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://tests/additionalobjects.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
12 changes: 6 additions & 6 deletions ...ntegration/update_cluster/additionalobjects/data/aws_s3_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Assets:
- 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
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
arm64:
- 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
- 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
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
CAs: {}
ClusterName: additionalobjects.example.com
Hooks:
Expand Down Expand Up @@ -52,8 +52,8 @@ UpdatePolicy: automatic
containerdConfig:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
usesLegacyGossip: false
usesNoneDNS: false
2 changes: 1 addition & 1 deletion ...piservernodes/data/aws_launch_template_apiserver.apiservers.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: apiserver
InstanceGroupRole: APIServer
NodeupConfigHash: l3nRkswFLRJz9+NSsfUxRBp41qhFPduoW+oCvAtzV6w=
NodeupConfigHash: EIgkLnJl3U4EFzyXuQ5gXvjha35bzV6n1ylj6GjlSHw=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...vernodes/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: jPAqMDLK/1OIx7dm3l4OXToMzXjL6p9o+fS1vFV2ZPI=
NodeupConfigHash: CPRkAF/qdlfj00w9Ksu6UDeWMHXgS3gBDb7k7F3zeHQ=

__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...pdate_cluster/apiservernodes/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: PR9VyDzo3oOm2vgery8NE94oD/ZmJoaTUVDUQhxMRnM=
NodeupConfigHash: dvk17VbpNYHsTCWmbiB9wPkSbHwqjhPgKHinq7FLCUw=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...tegration/update_cluster/apiservernodes/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@ spec:
containerd:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
12 changes: 6 additions & 6 deletions ...tegration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-apiserver_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ Assets:
- 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
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
arm64:
- 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
- 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
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
CAs:
apiserver-aggregator-ca: |
-----BEGIN CERTIFICATE-----
Expand Down Expand Up @@ -188,9 +188,9 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
staticManifests:
- key: kube-apiserver-healthcheck
path: manifests/static/kube-apiserver-healthcheck.yaml
Expand Down
12 changes: 6 additions & 6 deletions ...n/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-master-us-test-1a_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,17 @@ Assets:
- 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
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
- 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
- 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
arm64:
- 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
- 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
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
- 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
- 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
CAs:
Expand Down Expand Up @@ -311,9 +311,9 @@ configStore:
containerdConfig:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
etcdManifests:
- memfs://clusters.example.com/minimal.example.com/manifests/etcd/main-master-us-test-1a.yaml
- memfs://clusters.example.com/minimal.example.com/manifests/etcd/events-master-us-test-1a.yaml
Expand Down
12 changes: 6 additions & 6 deletions ...s/integration/update_cluster/apiservernodes/data/aws_s3_object_nodeupconfig-nodes_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@ Assets:
- 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
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
- 403af72d9f956ed8a5ad5b0ac0f1e8e371a1488f2b9edf9b4ba13db0653936ea@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-amd64.tar.gz
- 8781ab9f71c12f314d21c8e85f13ca1a82d90cf475aa5131a7b543fcc5487543@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.amd64
- 4793dc5c1f34ebf8402990d0050f3c294aa3c794cd5a4baa403c1cf10602326d@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-amd64.tar.gz
- 5966ca40b6187b30e33bfc299c5f1fe72e8c1aa01cf3fefdadf391668f47f103@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.amd64
arm64:
- 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
- 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
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
- fe81122c0cc8222470fa3be51f42fa918ac29ffd956ccd2fc408c1997babd2ca@https://github.com/containerd/containerd/releases/download/v2.1.5/containerd-2.1.5-linux-arm64.tar.gz
- 3c9a8e9e6dafd00db61f4611692447ebab4a56388bae4f82192aed67b66df712@https://github.com/opencontainers/runc/releases/download/v1.3.3/runc.arm64
- 88d6e32348c36628c8500a630c6dd4b3cb8c680b1d18dc8d1d19041f67757c6e@https://github.com/containerd/containerd/releases/download/v2.1.6/containerd-2.1.6-linux-arm64.tar.gz
- d6dcab36d1b6af1b72c7f0662e5fcf446a291271ba6006532b95c4144e19d428@https://github.com/opencontainers/runc/releases/download/v1.3.4/runc.arm64
CAs: {}
ClusterName: minimal.example.com
Hooks:
Expand Down Expand Up @@ -51,8 +51,8 @@ UpdatePolicy: automatic
containerdConfig:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
usesLegacyGossip: false
usesNoneDNS: false
2 changes: 1 addition & 1 deletion ...ntroller/data/aws_launch_template_master-us-test-1a.masters.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ ClusterName: minimal.example.com
ConfigBase: memfs://clusters.example.com/minimal.example.com
InstanceGroupName: master-us-test-1a
InstanceGroupRole: ControlPlane
NodeupConfigHash: 6swCfUencdy8VIm9RKug5V6VE5RcNhIgeMa6rzk1V2Y=
NodeupConfigHash: 2icbQ6vHAsN4Ifze6LpW6P2kPCWiv2RevZVf/yWt4l0=
__EOF_KUBE_ENV

Expand Down
2 changes: 1 addition & 1 deletion ...te_cluster/aws-lb-controller/data/aws_launch_template_nodes.minimal.example.com_user_data
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ ConfigServer:
- https://kops-controller.internal.minimal.example.com:3988/
InstanceGroupName: nodes
InstanceGroupRole: Node
NodeupConfigHash: W3QeOoWQYnSQa+eg8f6KsRL3ZxZBVkwP2MeiPL0He1I=
NodeupConfigHash: xSr1mAHep9FY+5prB+R/DRQYV9hPYsfZfDtwWT/nMVE=

__EOF_KUBE_ENV

Expand Down
4 changes: 2 additions & 2 deletions ...ration/update_cluster/aws-lb-controller/data/aws_s3_object_cluster-completed.spec_content
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,9 @@ spec:
containerd:
logLevel: info
runc:
version: 1.3.3
version: 1.3.4
sandboxImage: registry.k8s.io/pause:3.10.1
version: 2.1.5
version: 2.1.6
dnsZone: Z1AFAKE1ZON3YO
etcdClusters:
- backups:
Expand Down
Loading
Loading