From 0d657501d0802ab5bf049bc59d6175a36df2121b Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 9 Jul 2025 10:25:02 +0100 Subject: [PATCH] Revert "Merge pull request #23021 from ctalledo/eci-k8s-custom-registry-note" This reverts commit 6fbd921eedf9abc67799e536856003b12e9606b8. --- content/manuals/desktop/features/kubernetes.md | 12 +++++------- .../settings-management/configure-json-file.md | 13 ++++--------- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/content/manuals/desktop/features/kubernetes.md b/content/manuals/desktop/features/kubernetes.md index 057e91ae76a..74e0867d0a4 100644 --- a/content/manuals/desktop/features/kubernetes.md +++ b/content/manuals/desktop/features/kubernetes.md @@ -214,16 +214,14 @@ The recommended approach to set this up is the following: > [!NOTE] > -> In Docker Desktop versions 4.43 or earlier: when using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md) +> When using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md) > is enabled, add the following images to the [ECI Docker socket mount image list](../../security/for-admins/hardened-desktop/settings-management/configure-json-file.md#enhanced-container-isolation): > -> `[imagesRepository]/desktop-cloud-provider-kind:*` -> `[imagesRepository]/desktop-containerd-registry-mirror:*` +> * [imagesRepository]/desktop-cloud-provider-kind:* +> * [imagesRepository]/desktop-containerd-registry-mirror:* > -> These containers mount the Docker socket, so you must add the images to the -> ECI images list. If not, ECI will block the mount and Kubernetes won't -> start. This does not apply to Docker Desktop 4.44 or later because it -> automatically allows these images to mount the Docker socket. +> These containers mount the Docker socket, so you must add the images to the ECI images list. If not, +> ECI will block the mount and Kubernetes won't start. ## Troubleshooting diff --git a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md index 843d77b5007..532585c4553 100644 --- a/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md +++ b/content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md @@ -290,17 +290,12 @@ quit and reopened. > [!NOTE] > -> In Docker Desktop versions 4.43 or earlier: when using the `imagesRepository` -> setting and Enhanced Container Isolation (ECI), add the following images to -> the [ECI Docker socket mount image list](#enhanced-container-isolation): +> When using the `imagesRepository` setting and Enhanced Container Isolation (ECI), add the following images to the [ECI Docker socket mount image list](#enhanced-container-isolation): > -> `[imagesRepository]/desktop-cloud-provider-kind:*` -> `[imagesRepository]/desktop-containerd-registry-mirror:*` +> * [imagesRepository]/desktop-cloud-provider-kind:* +> * [imagesRepository]/desktop-containerd-registry-mirror:* > -> These containers mount the Docker socket, so you must add the images to the -> ECI images list. If not, ECI will block the mount and Kubernetes won't start. -> This does not apply to Docker Desktop 4.44 or later because it automatically -> allows these images to mount the Docker socket. +> These containers mount the Docker socket, so you must add the images to the ECI images list. If not, ECI will block the mount and Kubernetes won't start. ### Networking