Skip to content

Commit bf600c6

Browse files
authored
Revert "Adjust a note regarding Kubernetes custom registry images with ECI." (#23036)
Reverts #23021
1 parent f0dee0b commit bf600c6

File tree

2 files changed

+9
-16
lines changed

2 files changed

+9
-16
lines changed

content/manuals/desktop/features/kubernetes.md

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,14 @@ The recommended approach to set this up is the following:
214214
215215
> [!NOTE]
216216
>
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)
217+
> 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
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.
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.
227225
228226
## Troubleshooting
229227

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

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

291291
> [!NOTE]
292292
>
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):
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):
296294
>
297-
> `[imagesRepository]/desktop-cloud-provider-kind:*`
298-
> `[imagesRepository]/desktop-containerd-registry-mirror:*`
295+
> * [imagesRepository]/desktop-cloud-provider-kind:*
296+
> * [imagesRepository]/desktop-containerd-registry-mirror:*
299297
>
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.
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.
304299
305300
### Networking
306301

0 commit comments

Comments
 (0)