From 9d5110a8d68f4974c0ccf4cf89df54e762f05407 Mon Sep 17 00:00:00 2001 From: Allie Sadler <102604716+aevesdocker@users.noreply.github.com> Date: Wed, 9 Jul 2025 10:35:35 +0100 Subject: [PATCH] =?UTF-8?q?Revert=20"Revert=20"Adjust=20a=20note=20regardi?= =?UTF-8?q?ng=20Kubernetes=20custom=20registry=20images=20wit=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit bf600c694ff622c6d0c7d1d36c34c220ca1327ad. --- content/manuals/desktop/features/kubernetes.md | 12 +++++++----- .../settings-management/configure-json-file.md | 13 +++++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/content/manuals/desktop/features/kubernetes.md b/content/manuals/desktop/features/kubernetes.md index 74e0867d0a4..057e91ae76a 100644 --- a/content/manuals/desktop/features/kubernetes.md +++ b/content/manuals/desktop/features/kubernetes.md @@ -214,14 +214,16 @@ The recommended approach to set this up is the following: > [!NOTE] > -> When using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md) +> 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) > 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. +> 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. ## 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 532585c4553..843d77b5007 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,12 +290,17 @@ quit and reopened. > [!NOTE] > -> 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): +> 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): > -> * [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. +> 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. ### Networking