Skip to content

Commit 926d58c

Browse files
committed
Adjust a note regarding Kubernetes custom registry images with ECI.
Docker Desktop 4.44 brings in an improvement that makes a note in the docs no longer relevant. Re-word that note accordingly. The note will eventually be removed (say in 6 months once Docker Desktop 4.43 is no longer supported). Signed-off-by: Cesar Talledo <cesar.talledo@docker.com>
1 parent 215bfec commit 926d58c

File tree

2 files changed

+16
-9
lines changed

2 files changed

+16
-9
lines changed

content/manuals/desktop/features/kubernetes.md

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -214,14 +214,16 @@ The recommended approach to set this up is the following:
214214
215215
> [!NOTE]
216216
>
217-
> When using `KubernetesImagesRepository` and [Enhanced Container Isolation (ECI)](../../security/for-admins/hardened-desktop/enhanced-container-isolation/_index.md)
217+
> 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)
218218
> 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):
219219
>
220-
> * [imagesRepository]/desktop-cloud-provider-kind:*
221-
> * [imagesRepository]/desktop-containerd-registry-mirror:*
220+
> `[imagesRepository]/desktop-cloud-provider-kind:*`
221+
> `[imagesRepository]/desktop-containerd-registry-mirror:*`
222222
>
223-
> These containers mount the Docker socket, so you must add the images to the ECI images list. If not,
224-
> ECI will block the mount and Kubernetes won't start.
223+
> These containers mount the Docker socket, so you must add the images to the
224+
> ECI images list. If not, ECI will block the mount and Kubernetes won't
225+
> start. This does not apply to Docker Desktop 4.44 or later because it
226+
> automatically allows these images to mount the Docker socket.
225227
226228
## Troubleshooting
227229

content/manuals/security/for-admins/hardened-desktop/settings-management/configure-json-file.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -290,12 +290,17 @@ quit and reopened.
290290

291291
> [!NOTE]
292292
>
293-
> 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):
293+
> In Docker Desktop versions 4.43 or earlier: when using the `imagesRepository`
294+
> setting and Enhanced Container Isolation (ECI), add the following images to
295+
> the [ECI Docker socket mount image list](#enhanced-container-isolation):
294296
>
295-
> * [imagesRepository]/desktop-cloud-provider-kind:*
296-
> * [imagesRepository]/desktop-containerd-registry-mirror:*
297+
> `[imagesRepository]/desktop-cloud-provider-kind:*`
298+
> `[imagesRepository]/desktop-containerd-registry-mirror:*`
297299
>
298-
> 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.
300+
> These containers mount the Docker socket, so you must add the images to the
301+
> ECI images list. If not, ECI will block the mount and Kubernetes won't start.
302+
> This does not apply to Docker Desktop 4.44 or later because it automatically
303+
> allows these images to mount the Docker socket.
299304
300305
### Networking
301306

0 commit comments

Comments
 (0)