Sitelet https://github.com/kubernetes/kops/commit/fbd3406c60d51e959fd6b35fc8aa3a12c5dd4ee2
Skip to content

Commit fbd3406

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #18447 from hakman/downgrade-containerd
chore: downgrade containerd to v2.2.4
2 parents 1782152 + 795539a commit fbd3406

27 files changed

Lines changed: 85 additions & 88 deletions

File tree

‎docs/releases/1.36-NOTES.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
This is a document to gather the release notes prior to the release.
66

7-
kOps 1.36 adds Kubernetes 1.36 support, completes the move away from the in-tree cloud providers, refreshes the bundled components (containerd v2.3, etcd-manager, AWS Load Balancer Controller, EBS CSI driver, Cilium options, CoreDNS, etc.), reworks how the `kops-channels` addon manager is built and deployed, introduces a hybrid bootstrap path for gossip clusters, expands Azure and Hetzner support, and lays the groundwork for Linode (Akamai) as a new cloud provider.
7+
kOps 1.36 adds Kubernetes 1.36 support, completes the move away from the in-tree cloud providers, refreshes the bundled components (containerd v2.2, etcd-manager, AWS Load Balancer Controller, EBS CSI driver, Cilium options, CoreDNS, etc.), reworks how the `kops-channels` addon manager is built and deployed, introduces a hybrid bootstrap path for gossip clusters, expands Azure and Hetzner support, and lays the groundwork for Linode (Akamai) as a new cloud provider.
88

99
# Significant changes
1010

@@ -20,7 +20,7 @@ kOps 1.36 adds Kubernetes 1.36 support, completes the move away from the in-tree
2020
* Remove the unused in-tree cloud config plumbing ([#18347](https://github.com/kubernetes/kops/pull/18347))
2121

2222
## Container Runtime
23-
* Default containerd to v2.3.0 (with runc 1.4.2) for Kubernetes 1.36+; v2.2.3 remains the default for 1.32–1.35, and v1.7.31 for older clusters ([#18364](https://github.com/kubernetes/kops/pull/18364))
23+
* Default containerd to v2.2.4 (with runc 1.3.5) for Kubernetes 1.32+, and v1.7.32 for older clusters ([#18364](https://github.com/kubernetes/kops/pull/18364))
2424
* Support containerd config TOML v3, with clearer config-file version behavior and dead-code cleanup from 1.6 ([#18291](https://github.com/kubernetes/kops/pull/18291)). Users who set `spec.containerd.configAdditions` on a cluster or instance group must update those entries to match the TOML v3 schema before upgrading.
2525
* Map the containerd registry mirror wildcard to the `_default` directory ([#18291](https://github.com/kubernetes/kops/pull/18291))
2626
* Stream verified container image bytes directly into `ctr import` from nodeup and drop the containerized-mounter Archive task ([#18278](https://github.com/kubernetes/kops/pull/18278), [#18277](https://github.com/kubernetes/kops/pull/18277))

‎pkg/model/components/containerd.go‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,13 @@ func (b *ContainerdOptionsBuilder) BuildOptions(o *kops.Cluster) error {
5151
containerd.Runc = &kops.Runc{
5252
Version: fi.PtrTo("1.3.5"),
5353
}
54-
case b.IsKubernetesLT("1.36"):
54+
default:
55+
// Stay on containerd 2.2.x rather than 2.3.x to avoid a sandbox-image
56+
// regression in 2.3 (https://github.com/containerd/containerd/issues/13529).
5557
containerd.Version = fi.PtrTo("2.2.4")
5658
containerd.Runc = &kops.Runc{
5759
Version: fi.PtrTo("1.3.5"),
5860
}
59-
default:
60-
containerd.Version = fi.PtrTo("2.3.1")
61-
containerd.Runc = &kops.Runc{
62-
Version: fi.PtrTo("1.4.2"),
63-
}
6461
}
6562
}
6663
// Set the default log level to INFO

‎tests/integration/update_cluster/gossip-aws/data/aws_launch_template_master-us-test-1a.masters.gossip.k8s.local_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ ClusterName: gossip.k8s.local
126126
ConfigBase: memfs://tests/gossip.k8s.local
127127
InstanceGroupName: master-us-test-1a
128128
InstanceGroupRole: ControlPlane
129-
NodeupConfigHash: 1pm6BY+ab63mQSW1/ZfgYGfsRDIbvCccuDYqsEg08XA=
129+
NodeupConfigHash: VbjEp+Axj82oms4GyHO1IGs/59j+pfNTVn36MeUsKdc=
130130
131131
__EOF_KUBE_ENV
132132

‎tests/integration/update_cluster/gossip-aws/data/aws_launch_template_nodes.gossip.k8s.local_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.gossip.k8s.local:3988/
150150
InstanceGroupName: nodes
151151
InstanceGroupRole: Node
152-
NodeupConfigHash: tGolsQcYa7KvneHf+KnOHWd9/Ke0kjnjH25hscbOwms=
152+
NodeupConfigHash: Jw3JarWmyueHHS7VHTP4RAZNaiaf24s1upXmQ49rC1Q=
153153
154154
__EOF_KUBE_ENV
155155

‎tests/integration/update_cluster/gossip-aws/data/aws_s3_object_cluster-completed.spec_content‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ spec:
2929
containerd:
3030
logLevel: info
3131
runc:
32-
version: 1.4.2
32+
version: 1.3.5
3333
sandboxImage: registry.k8s.io/pause:3.10.1
34-
version: 2.3.1
34+
version: 2.2.4
3535
etcdClusters:
3636
- backups:
3737
backupStore: memfs://tests/gossip.k8s.local/backups/etcd/main

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,16 @@ Assets:
5959
- 123d8c8844f46b1244c547fffb3c17180c0c26dac9890589fe7e67763298748e@https://dl.k8s.io/release/v1.36.0/bin/linux/amd64/kubectl
6060
- 7644623e4ec9ad443ab352a8a5800a5180ee28741288be805286ba72bb8e7164@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/amd64/ecr-credential-provider-linux-amd64
6161
- b8e811578fb66023f90d2e238d80cec3bdfca4b44049af74c374d4fae0f9c090@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-amd64-v1.6.2.tgz
62-
- 628448bd973610c656c1cbea8e88b32fafd85b23cc1aa4a3372eb7198478c054@https://github.com/containerd/containerd/releases/download/v2.3.1/containerd-2.3.1-linux-amd64.tar.gz
63-
- ac8a90f9e225bb9322189937b230cdc5478d5753f0e31e1bda98a5cf06bd9539@https://github.com/opencontainers/runc/releases/download/v1.4.2/runc.amd64
62+
- 62e77f6294e432dca5b56ad7e7d6085b5bbb526ebba0a51d832714f9b04cfdfd@https://github.com/containerd/containerd/releases/download/v2.2.4/containerd-2.2.4-linux-amd64.tar.gz
63+
- 66fa8390be8fb3b23dfbb60c767368bb5b51f1acfa88692bbff1a82953d4d9e9@https://github.com/opencontainers/runc/releases/download/v1.3.5/runc.amd64
6464
- 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
6565
arm64:
6666
- 049d95107361583e64f3ac9b8c9bdaf73fc7e512a838972b13b423a33ece87e9@https://dl.k8s.io/release/v1.36.0/bin/linux/arm64/kubelet
6767
- 9f9d9c44a7b5264515ac9da5991584e2395bd50662e651132337e7b4d0c56f8f@https://dl.k8s.io/release/v1.36.0/bin/linux/arm64/kubectl
6868
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
6969
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
70-
- 46a83603a850f3916ca7c942310daaf82ed17773a85b1d431e92d4a541e46d0d@https://github.com/containerd/containerd/releases/download/v2.3.1/containerd-2.3.1-linux-arm64.tar.gz
71-
- ea54032310588e115633aa2f4bba8bf9500257f657e1deca88df5778775138db@https://github.com/opencontainers/runc/releases/download/v1.4.2/runc.arm64
70+
- d0897c8e27c96a7b7d4c73e9b278ea9f559dda619d497d88b323a528bd1412c3@https://github.com/containerd/containerd/releases/download/v2.2.4/containerd-2.2.4-linux-arm64.tar.gz
71+
- bd843d75a788e612c9df286b1fa519a44fcbb7a7b8d01e2268431433cc7c718c@https://github.com/opencontainers/runc/releases/download/v1.3.5/runc.arm64
7272
- 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
7373
CAs:
7474
apiserver-aggregator-ca: |
@@ -302,9 +302,9 @@ configStore:
302302
containerdConfig:
303303
logLevel: info
304304
runc:
305-
version: 1.4.2
305+
version: 1.3.5
306306
sandboxImage: registry.k8s.io/pause:3.10.1
307-
version: 2.3.1
307+
version: 2.2.4
308308
etcdManifests:
309309
- memfs://tests/gossip.k8s.local/manifests/etcd/main-master-us-test-1a.yaml
310310
- memfs://tests/gossip.k8s.local/manifests/etcd/events-master-us-test-1a.yaml

‎tests/integration/update_cluster/gossip-aws/data/aws_s3_object_nodeupconfig-nodes_content‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ Assets:
44
- 123d8c8844f46b1244c547fffb3c17180c0c26dac9890589fe7e67763298748e@https://dl.k8s.io/release/v1.36.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-
- 628448bd973610c656c1cbea8e88b32fafd85b23cc1aa4a3372eb7198478c054@https://github.com/containerd/containerd/releases/download/v2.3.1/containerd-2.3.1-linux-amd64.tar.gz
8-
- ac8a90f9e225bb9322189937b230cdc5478d5753f0e31e1bda98a5cf06bd9539@https://github.com/opencontainers/runc/releases/download/v1.4.2/runc.amd64
7+
- 62e77f6294e432dca5b56ad7e7d6085b5bbb526ebba0a51d832714f9b04cfdfd@https://github.com/containerd/containerd/releases/download/v2.2.4/containerd-2.2.4-linux-amd64.tar.gz
8+
- 66fa8390be8fb3b23dfbb60c767368bb5b51f1acfa88692bbff1a82953d4d9e9@https://github.com/opencontainers/runc/releases/download/v1.3.5/runc.amd64
99
- 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
1010
arm64:
1111
- 049d95107361583e64f3ac9b8c9bdaf73fc7e512a838972b13b423a33ece87e9@https://dl.k8s.io/release/v1.36.0/bin/linux/arm64/kubelet
1212
- 9f9d9c44a7b5264515ac9da5991584e2395bd50662e651132337e7b4d0c56f8f@https://dl.k8s.io/release/v1.36.0/bin/linux/arm64/kubectl
1313
- 1980e3a038cb16da48a137743b31fb81de6c0b59fa06c206c2bc20ce0a52f849@https://artifacts.k8s.io/binaries/cloud-provider-aws/v1.31.7/linux/arm64/ecr-credential-provider-linux-arm64
1414
- 01e0e22acc7f7004e4588c1fe1871cc86d7ab562cd858e1761c4641d89ebfaa4@https://github.com/containernetworking/plugins/releases/download/v1.6.2/cni-plugins-linux-arm64-v1.6.2.tgz
15-
- 46a83603a850f3916ca7c942310daaf82ed17773a85b1d431e92d4a541e46d0d@https://github.com/containerd/containerd/releases/download/v2.3.1/containerd-2.3.1-linux-arm64.tar.gz
16-
- ea54032310588e115633aa2f4bba8bf9500257f657e1deca88df5778775138db@https://github.com/opencontainers/runc/releases/download/v1.4.2/runc.arm64
15+
- d0897c8e27c96a7b7d4c73e9b278ea9f559dda619d497d88b323a528bd1412c3@https://github.com/containerd/containerd/releases/download/v2.2.4/containerd-2.2.4-linux-arm64.tar.gz
16+
- bd843d75a788e612c9df286b1fa519a44fcbb7a7b8d01e2268431433cc7c718c@https://github.com/opencontainers/runc/releases/download/v1.3.5/runc.arm64
1717
- 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
1818
CAs: {}
1919
ClusterName: gossip.k8s.local
@@ -53,8 +53,8 @@ UpdatePolicy: automatic
5353
containerdConfig:
5454
logLevel: info
5555
runc:
56-
version: 1.4.2
56+
version: 1.3.5
5757
sandboxImage: registry.k8s.io/pause:3.10.1
58-
version: 2.3.1
58+
version: 2.2.4
5959
usesLegacyGossip: true
6060
usesNoneDNS: false

‎tests/integration/update_cluster/gossip-azure/data/azurerm_linux_virtual_machine_scale_set_control-plane-eastus-1.masters.gossip.k8s.local_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ ClusterName: gossip.k8s.local
125125
ConfigBase: memfs://tests/gossip.k8s.local
126126
InstanceGroupName: control-plane-eastus-1
127127
InstanceGroupRole: ControlPlane
128-
NodeupConfigHash: GVPe15FsTb0G6rulm6qR7OITa3vQg/34YWSWSPALFLQ=
128+
NodeupConfigHash: z1OZw05UQ+XjMqrk5kgIzAVSA0zyeF1IenEdJn2uxJw=
129129
130130
__EOF_KUBE_ENV
131131

‎tests/integration/update_cluster/gossip-azure/data/azurerm_linux_virtual_machine_scale_set_nodes-eastus-1.gossip.k8s.local_user_data‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ ConfigServer:
148148
- https://kops-controller.internal.gossip.k8s.local:3988/
149149
InstanceGroupName: nodes-eastus-1
150150
InstanceGroupRole: Node
151-
NodeupConfigHash: teimdkCoryzf7FnmfP/s5jTiJQsROFiivBSlMNO0Yfc=
151+
NodeupConfigHash: NoKZKNORV22wdh/hvAlBVpt0DLx2FvhzqPzqabtFznM=
152152
153153
__EOF_KUBE_ENV
154154

‎tests/integration/update_cluster/gossip-azure/data/azurerm_storage_blob_cluster-completed.spec_source‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ spec:
3030
containerd:
3131
logLevel: info
3232
runc:
33-
version: 1.4.2
33+
version: 1.3.5
3434
sandboxImage: registry.k8s.io/pause:3.10.1
35-
version: 2.3.1
35+
version: 2.2.4
3636
etcdClusters:
3737
- backups:
3838
backupStore: memfs://tests/gossip.k8s.local/backups/etcd/main

0 commit comments

Comments
 (0)