From 1341f966b4420f08c64c163b0a8a0d55257bf555 Mon Sep 17 00:00:00 2001 From: Animesh Das Date: Sun, 17 Apr 2022 15:11:26 +0530 Subject: [PATCH 1/4] docs:added k3s wsl2 setup code snippet --- content/en/v3/admin/platforms/k3s/_index.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/content/en/v3/admin/platforms/k3s/_index.md b/content/en/v3/admin/platforms/k3s/_index.md index 48406cca46d..5ee4f3f1ea8 100644 --- a/content/en/v3/admin/platforms/k3s/_index.md +++ b/content/en/v3/admin/platforms/k3s/_index.md @@ -81,7 +81,10 @@ Make sure you have vault running in a docker container with kubernetes auth enab ```bash docker run --name jx-k3s-vault -d --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=myroot' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' --net host vault:latest ``` - +##### For WSL2 Distros use the following command: +```bash +docker run --name jx-k3s-vault -d --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=myroot' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' -p 8200:8200 vault:latest +``` To verify if vault started properly use `docker logs jx-k3s-vault`. Next enable kubernetes auth in vault. From b5499dfac7a58f4a98fefefe6ce12acb5e33c1da Mon Sep 17 00:00:00 2001 From: Animesh Das Date: Tue, 19 Apr 2022 01:47:39 +0530 Subject: [PATCH 2/4] docs: updated text on wsl2,and k3s setup script Signed-off-by: Animesh Das --- content/en/v3/admin/platforms/k3s/_index.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/content/en/v3/admin/platforms/k3s/_index.md b/content/en/v3/admin/platforms/k3s/_index.md index 5ee4f3f1ea8..08d2ece0c92 100644 --- a/content/en/v3/admin/platforms/k3s/_index.md +++ b/content/en/v3/admin/platforms/k3s/_index.md @@ -21,6 +21,8 @@ This guide will walk you though how to setup Jenkins X on your laptop using [k3s If you are on Mac OS, you can follow this [guide](https://docs.kalm.dev/install/install-local-k3s/) to set up k3s. You do not need to install kalm for the rest of the tutorial. + +If you are on Windows, you can use [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)(WSL).It lets developers run a GNU/Linux environment.This includes CLI tools,utilities, applications on Windows without the use of Virtual Machine or dual-boot setup. ### Prerequisites #### K3s @@ -38,6 +40,13 @@ export KUBECONFIG=~/.kube/config:~/.kube/k3s-config ``` +**For WSL2 users:** +- Download k3s binary from https://github.com/rancher/k3s/releases/latest + +- `chmod +x k3s` + +- Run k3s `sudo ./k3s server` + To verify that k3s has been installed successfully, and configured run: ```bash @@ -81,10 +90,11 @@ Make sure you have vault running in a docker container with kubernetes auth enab ```bash docker run --name jx-k3s-vault -d --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=myroot' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' --net host vault:latest ``` -##### For WSL2 Distros use the following command: +**For WSL2 users:** ```bash docker run --name jx-k3s-vault -d --cap-add=IPC_LOCK -e 'VAULT_DEV_ROOT_TOKEN_ID=myroot' -e 'VAULT_DEV_LISTEN_ADDRESS=0.0.0.0:8200' -p 8200:8200 vault:latest ``` + To verify if vault started properly use `docker logs jx-k3s-vault`. Next enable kubernetes auth in vault. From ae7d8e521107b37f3ff6a40277c44e906d14e80c Mon Sep 17 00:00:00 2001 From: Animesh Das Date: Thu, 21 Apr 2022 00:53:37 +0530 Subject: [PATCH 3/4] PR issues resolved Signed-off-by: Animesh Das --- content/en/v3/admin/platforms/k3s/_index.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/content/en/v3/admin/platforms/k3s/_index.md b/content/en/v3/admin/platforms/k3s/_index.md index 08d2ece0c92..981fc489b0e 100644 --- a/content/en/v3/admin/platforms/k3s/_index.md +++ b/content/en/v3/admin/platforms/k3s/_index.md @@ -42,10 +42,9 @@ export KUBECONFIG=~/.kube/config:~/.kube/k3s-config **For WSL2 users:** - Download k3s binary from https://github.com/rancher/k3s/releases/latest - - `chmod +x k3s` +- Start a new Terminal and Run k3s `sudo ./k3s server` (Don't close this terminal). -- Run k3s `sudo ./k3s server` To verify that k3s has been installed successfully, and configured run: From bf04b6cfbbaff6ecf607a9b22bf7dc3b3a03ba18 Mon Sep 17 00:00:00 2001 From: Animesh Das Date: Fri, 22 Apr 2022 14:13:45 +0530 Subject: [PATCH 4/4] PR changes resolved: Added space Signed-off-by: Animesh Das --- content/en/v3/admin/platforms/k3s/_index.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/en/v3/admin/platforms/k3s/_index.md b/content/en/v3/admin/platforms/k3s/_index.md index 981fc489b0e..fc22ed95317 100644 --- a/content/en/v3/admin/platforms/k3s/_index.md +++ b/content/en/v3/admin/platforms/k3s/_index.md @@ -22,7 +22,7 @@ This guide will walk you though how to setup Jenkins X on your laptop using [k3s If you are on Mac OS, you can follow this [guide](https://docs.kalm.dev/install/install-local-k3s/) to set up k3s. You do not need to install kalm for the rest of the tutorial. -If you are on Windows, you can use [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)(WSL).It lets developers run a GNU/Linux environment.This includes CLI tools,utilities, applications on Windows without the use of Virtual Machine or dual-boot setup. +If you are on Windows, you can use [Windows Subsystem for Linux](https://docs.microsoft.com/en-us/windows/wsl/)(WSL). It lets developers run a GNU/Linux environment. This includes CLI tools,utilities, applications on Windows without the use of Virtual Machine or dual-boot setup. ### Prerequisites #### K3s