From 60c9f16cf8779c4e1fb20a38eedb20872e73f1dd Mon Sep 17 00:00:00 2001 From: thisisharrsh Date: Thu, 17 Oct 2024 10:47:56 +0530 Subject: [PATCH 1/4] fixed the container runtime documentation --- .../en/docs/setup/production-environment/container-runtimes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index 08108204d15b8..53e29c192707f 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -171,7 +171,7 @@ follow [configuring a cgroup driver](/docs/tasks/administer-cluster/kubeadm/conf ## CRI version support {#cri-versions} -Your container runtime must support at least v1alpha2 of the container runtime interface. +Your container runtime must support at least v1 of the container runtime interface. Kubernetes [starting v1.26](/blog/2022/11/18/upcoming-changes-in-kubernetes-1-26/#cri-api-removal) _only works_ with v1 of the CRI API. Earlier versions default From dbf8bc0d23d1cb2c53913fd9ab4a917a8edf29d7 Mon Sep 17 00:00:00 2001 From: thisisharrsh Date: Thu, 17 Oct 2024 11:01:56 +0530 Subject: [PATCH 2/4] fixed the CRI proto reference --- content/en/docs/concepts/architecture/cri.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/docs/concepts/architecture/cri.md b/content/en/docs/concepts/architecture/cri.md index 055df28b4fe2c..ede39b1659a6f 100644 --- a/content/en/docs/concepts/architecture/cri.md +++ b/content/en/docs/concepts/architecture/cri.md @@ -47,4 +47,4 @@ requires a restart of the kubelet. ## {{% heading "whatsnext" %}} -- Learn more about the CRI [protocol definition](https://github.com/kubernetes/cri-api/blob/c75ef5b/pkg/apis/runtime/v1/api.proto) +- Learn more about the CRI [protocol definition](https://github.com/kubernetes/cri-api/tree/master) From c800db13afe465f762bf20a87d9f6fbe7dd4bfeb Mon Sep 17 00:00:00 2001 From: thisisharrsh Date: Thu, 24 Oct 2024 11:28:29 +0530 Subject: [PATCH 3/4] fixed the suggested changes in the container runtime docs and fixed the reference for CRI proto --- content/en/docs/concepts/architecture/cri.md | 2 +- .../docs/setup/production-environment/container-runtimes.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/en/docs/concepts/architecture/cri.md b/content/en/docs/concepts/architecture/cri.md index ede39b1659a6f..8ca0a8baf4a53 100644 --- a/content/en/docs/concepts/architecture/cri.md +++ b/content/en/docs/concepts/architecture/cri.md @@ -47,4 +47,4 @@ requires a restart of the kubelet. ## {{% heading "whatsnext" %}} -- Learn more about the CRI [protocol definition](https://github.com/kubernetes/cri-api/tree/master) +- Learn more about the CRI [protocol definition](https://github.com/kubernetes/cri-api/blob/{{< skew currentVersion >}}/pkg/apis/runtime/v1/api.proto) diff --git a/content/en/docs/setup/production-environment/container-runtimes.md b/content/en/docs/setup/production-environment/container-runtimes.md index 53e29c192707f..2f2b204b36266 100644 --- a/content/en/docs/setup/production-environment/container-runtimes.md +++ b/content/en/docs/setup/production-environment/container-runtimes.md @@ -171,12 +171,12 @@ follow [configuring a cgroup driver](/docs/tasks/administer-cluster/kubeadm/conf ## CRI version support {#cri-versions} -Your container runtime must support at least v1 of the container runtime interface. +Your container runtime must support v1 of the container runtime interface. Kubernetes [starting v1.26](/blog/2022/11/18/upcoming-changes-in-kubernetes-1-26/#cri-api-removal) _only works_ with v1 of the CRI API. Earlier versions default to v1 version, however if a container runtime does not support the v1 API, the kubelet falls back to -using the (deprecated) v1alpha2 API instead. +using the (deprecated and removed) v1alpha2 API instead. ## Container runtimes From fe88f1854dc129f7c60a2f7063ab27ccd4c9f0fe Mon Sep 17 00:00:00 2001 From: thisisharrsh Date: Fri, 25 Oct 2024 14:51:39 +0530 Subject: [PATCH 4/4] Fixed the stale CRI documentation --- content/en/docs/concepts/architecture/cri.md | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/content/en/docs/concepts/architecture/cri.md b/content/en/docs/concepts/architecture/cri.md index 8ca0a8baf4a53..d5a2ae08b1754 100644 --- a/content/en/docs/concepts/architecture/cri.md +++ b/content/en/docs/concepts/architecture/cri.md @@ -29,12 +29,8 @@ runtime, which can be configured separately within the kubelet by using the `--image-service-endpoint` [command line flags](/docs/reference/command-line-tools-reference/kubelet). For Kubernetes v{{< skew currentVersion >}}, the kubelet prefers to use CRI `v1`. -If a container runtime does not support `v1` of the CRI, then the kubelet tries to -negotiate any older supported version. -The v{{< skew currentVersion >}} kubelet can also negotiate CRI `v1alpha2`, but -this version is considered as deprecated. -If the kubelet cannot negotiate a supported CRI version, the kubelet gives up -and doesn't register as a node. +If a container runtime does not support `v1` of the CRI, then the kubelet cannot register as a node. +The v{{< skew currentVersion >}} kubelet only supports CRI `v1`. The deprecated `v1alpha2` API is no longer supported. If the kubelet cannot connect to a container runtime using CRI `v1`, it will give up and will not register as a node. ## Upgrading