Skip to content

Commit 433744e

Browse files
authored
ENGDOCS-2405b (#21922)
<!--Delete sections as needed --> ## Description Kubernetes updates for 4.38 ## Related issues or tickets <!-- Related issues, pull requests, or Jira tickets --> ## Reviews <!-- Notes for reviewers here --> <!-- List applicable reviews (optionally @tag reviewers) --> - [ ] Technical review - [ ] Editorial review - [ ] Product review
1 parent 414c77d commit 433744e

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

_vale/config/vocabularies/Docker/accept.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ Jamf
5757
JetBrains
5858
Kerberos
5959
Kitematic
60+
Kubeadm
6061
Kubernetes
6162
Laravel
6263
Laradock

content/manuals/desktop/features/kubernetes.md

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
description: See how you can deploy to Kubernetes on Docker Desktop
33
keywords: deploy, kubernetes, kubectl, orchestration, Docker Desktop
44
title: Deploy on Kubernetes with Docker Desktop
5+
linkTitle: Deploy on Kubernetes
56
aliases:
67
- /docker-for-windows/kubernetes/
78
- /docker-for-mac/kubernetes/
@@ -11,7 +12,7 @@ weight: 60
1112

1213
Docker Desktop includes a standalone Kubernetes server and client, as well as Docker CLI integration, enabling local Kubernetes development and testing directly on your machine.
1314

14-
The Kubernetes server runs as a single-node cluster within a Docker container. This lightweight setup helps you explore Kubernetes features, test workloads, and work with container orchestration in parallel with other Docker functionalities.
15+
The Kubernetes server runs as a single or multi-node cluster within a Docker container. This lightweight setup helps you explore Kubernetes features, test workloads, and work with container orchestration in parallel with other Docker functionalities.
1516

1617
Kubernetes on Docker Desktop runs alongside other workloads, including Swarm services and standalone containers.
1718

@@ -30,8 +31,11 @@ Turning the Kubernetes server on or off in Docker Desktop does not affect your o
3031

3132
1. Open the Docker Desktop Dashboard and navigate to **Settings**.
3233
2. Select the **Kubernetes** tab.
33-
3. Select the **Enable Kubernetes** checkbox.
34-
4. Select **Apply & Restart** to save the settings and then select **Install** to confirm. This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\Resources\bin\kubectl.exe` (Windows).
34+
3. Toggle on **Enable Kubernetes**.
35+
4. Choose your cluster provisioning method. You can choose either **Kubeadm** or **kind** if you are signed in and are using Docker Desktop version 4.38 or later.
36+
37+
If you select **kind** you can also choose the Kubernetes version and the number of nodes.
38+
5. Select **Apply & Restart** to save the settings. This sets up the images required to run the Kubernetes server as containers, and installs the `kubectl` command-line tool on your system at `/usr/local/bin/kubectl` (Mac) or `C:\Program Files\Docker\Docker\Resources\bin\kubectl.exe` (Windows).
3539

3640
> [!NOTE]
3741
>
@@ -45,9 +49,15 @@ You can check which version of Kubernetes you're on with:
4549
$ kubectl version
4650
```
4751

48-
### Viewing system containers
52+
### Additional settings
53+
54+
#### Kubernetes dashboard
55+
56+
Once Kubernetes is installed and set up, you can select the **Deploy the Kubernetes Dashboard into cluster** setting so you can manage and monitor your Kubernetes clusters and applications more easily.
57+
58+
#### Viewing system containers
4959

50-
By default, Kubernetes system containers are hidden. To inspect these containers, navigate to **Settings** > **Kubernetes** and then enable **Show system containers (advanced)**.
60+
By default, Kubernetes system containers are hidden. To inspect these containers, enable **Show system containers (advanced)**.
5161

5262
You can now view the running Kubernetes containers with `docker ps` or in the Docker Desktop Dashboard.
5363

content/manuals/desktop/settings-and-maintenance/settings.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,12 @@ deploying your Docker workloads on Kubernetes. To turn on Kubernetes support and
425425
install a standalone instance of Kubernetes running as a Docker container,
426426
select **Enable Kubernetes**.
427427

428+
With Docker Desktop version 4.38 and later, you can choose your cluster provisioning method:
429+
- **Kubeadm** creates a single-node cluster and the version is set by Docker Desktop.
430+
- **kind** creates a multi-node cluster and you can set the version and number of nodes.
431+
432+
Docker Desktop version 4.38 and later also lets you install the Kubernetes Dashboard within an existing Kubernetes cluster with the **Deploy the Kubernetes Dashboard into cluster** setting. It provides real-time visibility into workloads and nodes and helps you manage and monitor your Kubernetes clusters and applications easily.
433+
428434
Select **Show system containers (advanced)** to view internal containers when
429435
using Docker commands.
430436

0 commit comments

Comments
 (0)