From 475dbcdd99575c0bf1066dcc78d07bea2b6d5d12 Mon Sep 17 00:00:00 2001 From: manuelbuil Date: Thu, 19 Dec 2024 18:25:06 +0100 Subject: [PATCH] Sync with the rke2 information about embedded registry Signed-off-by: manuelbuil --- docs/installation/airgap.md | 7 ++----- docs/installation/registry-mirror.md | 5 ++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/docs/installation/airgap.md b/docs/installation/airgap.md index df802e693..889fcaf8d 100644 --- a/docs/installation/airgap.md +++ b/docs/installation/airgap.md @@ -2,7 +2,8 @@ title: "Air-Gap Install" --- -You can install K3s in an air-gapped environment using two different methods. An air-gapped environment is any environment that is not directly connected to the Internet. You can either deploy a private registry and mirror docker.io, or you can manually deploy images such as for small clusters. +K3s can be installed in an air-gapped environment with two different methods. You can either deploy images via the [k3s-airgap-images tarball release artifact](#manually-deploy-images-method) or by using a [private registry](#private-registry-method). It is also possible to use the [embedded registry mirror](#embedded-registry-mirror) as long as there is at least one cluster member that has access to the required images. + ## Load Images @@ -42,10 +43,6 @@ This method requires you to manually deploy the necessary images to each node, a ### Embedded Registry Mirror -:::info Version Gate -The Embedded Registry Mirror is available as an experimental feature as of January 2024 releases: v1.26.13+k3s1, v1.27.10+k3s1, v1.28.6+k3s1, v1.29.1+k3s1 -::: - K3s includes an embedded distributed OCI-compliant registry mirror. When enabled and properly configured, images available in the containerd image store on any node can be pulled by other cluster members without access to an external image registry. diff --git a/docs/installation/registry-mirror.md b/docs/installation/registry-mirror.md index e305d6bfa..855e7c9c5 100644 --- a/docs/installation/registry-mirror.md +++ b/docs/installation/registry-mirror.md @@ -3,11 +3,10 @@ title: "Embedded Registry Mirror" --- :::info Version Gate -The Embedded Registry Mirror is available as an experimental feature as of January 2024 releases: v1.26.13+k3s1, v1.27.10+k3s1, v1.28.6+k3s1, v1.29.1+k3s1 +The Embedded Registry Mirror is available as an experimental feature as of January 2024 releases: v1.26.13+k3s1, v1.27.10+k3s1, v1.28.6+k3s1, v1.29.1+k3s1 and GA as of December 2024 releases: v1.29.12+k3s1, v1.30.8+k3s1, v1.31.4+k3s1 ::: -K3s embeds [Spegel](https://github.com/spegel-org/spegel), a stateless distributed OCI registry mirror that allows peer-to-peer sharing of container images between nodes in a Kubernetes cluster. -The distributed registry mirror is disabled by default. +K3s embeds [Spegel](https://github.com/spegel-org/spegel), a stateless distributed OCI registry mirror that allows peer-to-peer sharing of container images between nodes in a Kubernetes cluster. The distributed registry mirror is disabled by default. For K3s to leverage it, you must enable both the [Distributed OCI Registry Mirror](#enabling-the-distributed-oci-registry-mirror) and the [Registry mirroring](#enabling-registry-mirroring) as explained in the following subsections. ## Enabling The Distributed OCI Registry Mirror