From e568d2decac7ef2b060b5fa4a12068c012fb1387 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Wed, 29 Jan 2025 13:06:40 +0000 Subject: [PATCH 1/2] ENGDOCS-2405b --- .../manuals/desktop/features/kubernetes.md | 19 ++++++++++++++----- .../settings-and-maintenance/settings.md | 6 ++++++ 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/content/manuals/desktop/features/kubernetes.md b/content/manuals/desktop/features/kubernetes.md index 7ad1a0415719..ba1a783836cf 100644 --- a/content/manuals/desktop/features/kubernetes.md +++ b/content/manuals/desktop/features/kubernetes.md @@ -11,7 +11,7 @@ weight: 60 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. -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. +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. Kubernetes on Docker Desktop runs alongside other workloads, including Swarm services and standalone containers. @@ -30,8 +30,11 @@ Turning the Kubernetes server on or off in Docker Desktop does not affect your o 1. Open the Docker Desktop Dashboard and navigate to **Settings**. 2. Select the **Kubernetes** tab. -3. Select the **Enable Kubernetes** checkbox. -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). +3. Toggle on **Enable Kubernetes**. +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. + + If you select **kind** you can also choose the Kubernetes version and the number of nodes. +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). > [!NOTE] > @@ -45,9 +48,15 @@ You can check which version of Kubernetes you're on with: $ kubectl version ``` -### Viewing system containers +### Additional settings + +#### Kubernetes dashboard + +Once Kubernetes is installed and setup, you can select the **Deploy the Kubernetes Dashboard into cluster** setting so you can manage and monitor your Kubernetes clusters and applications more easily. + +#### Viewing system containers -By default, Kubernetes system containers are hidden. To inspect these containers, navigate to **Settings** > **Kubernetes** and then enable **Show system containers (advanced)**. +By default, Kubernetes system containers are hidden. To inspect these containers, enable **Show system containers (advanced)**. You can now view the running Kubernetes containers with `docker ps` or in the Docker Desktop Dashboard. diff --git a/content/manuals/desktop/settings-and-maintenance/settings.md b/content/manuals/desktop/settings-and-maintenance/settings.md index 9080ee5e2e85..07ad4bf44972 100644 --- a/content/manuals/desktop/settings-and-maintenance/settings.md +++ b/content/manuals/desktop/settings-and-maintenance/settings.md @@ -425,6 +425,12 @@ deploying your Docker workloads on Kubernetes. To turn on Kubernetes support and install a standalone instance of Kubernetes running as a Docker container, select **Enable Kubernetes**. +With Docker Desktop version 4.38 and later, you can choose your cluster provisioning method: + - **Kubeadm** creates a single-node cluster and the version is set by Docker Desktop. + - **kind** creates a multi-node cluster and you can set the version and number of nodes. + +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. + Select **Show system containers (advanced)** to view internal containers when using Docker commands. From 5315bfcf07efede1a4c4e3999badc0dc1abf9140 Mon Sep 17 00:00:00 2001 From: aevesdocker Date: Wed, 29 Jan 2025 15:13:34 +0000 Subject: [PATCH 2/2] edits --- _vale/config/vocabularies/Docker/accept.txt | 1 + content/manuals/desktop/features/kubernetes.md | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/_vale/config/vocabularies/Docker/accept.txt b/_vale/config/vocabularies/Docker/accept.txt index 30a2146f27c4..d121035f1e46 100644 --- a/_vale/config/vocabularies/Docker/accept.txt +++ b/_vale/config/vocabularies/Docker/accept.txt @@ -57,6 +57,7 @@ Jamf JetBrains Kerberos Kitematic +Kubeadm Kubernetes Laravel Laradock diff --git a/content/manuals/desktop/features/kubernetes.md b/content/manuals/desktop/features/kubernetes.md index ba1a783836cf..12978440c8f5 100644 --- a/content/manuals/desktop/features/kubernetes.md +++ b/content/manuals/desktop/features/kubernetes.md @@ -2,6 +2,7 @@ description: See how you can deploy to Kubernetes on Docker Desktop keywords: deploy, kubernetes, kubectl, orchestration, Docker Desktop title: Deploy on Kubernetes with Docker Desktop +linkTitle: Deploy on Kubernetes aliases: - /docker-for-windows/kubernetes/ - /docker-for-mac/kubernetes/ @@ -52,7 +53,7 @@ $ kubectl version #### Kubernetes dashboard -Once Kubernetes is installed and setup, you can select the **Deploy the Kubernetes Dashboard into cluster** setting so you can manage and monitor your Kubernetes clusters and applications more easily. +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. #### Viewing system containers