From 6c6991410c4c7ff362a9b7b840b4d80405c4d135 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 21 Oct 2022 15:35:26 +0000 Subject: [PATCH 1/2] chore: 2 minor clarifications around features --- admin/git.md | 14 ++++++++++++++ setup/scaling.md | 7 ++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/admin/git.md b/admin/git.md index 0b2c04012..5d4adf8db 100644 --- a/admin/git.md +++ b/admin/git.md @@ -125,3 +125,17 @@ When done, click **Save**. > - name: CODERD_BITBUCKET_CONSUMER_KEY > value: "" > ``` + +### Built-in GitHub Integration (VS Code) + +Alternatively, users can VS Code's +[built-in GitHub integration](https://code.visualstudio.com/docs/sourcecontrol/github) +in order to clone repositories within VS Code Remote and code-server. This uses +a GitHub token to authenticate instead of SSH keys. + +To cache the token within the workspace, users can run the following command. +This can also be added to a [configure script](../images/configure.md): + +```sh +git config --global credential.helper store +``` diff --git a/setup/scaling.md b/setup/scaling.md index 9e92a8211..ef0ea3da4 100644 --- a/setup/scaling.md +++ b/setup/scaling.md @@ -84,8 +84,5 @@ ensuring sufficient resources and response time. ### Horizontal Pod Autoscaling -Horizontal Pod Autoscaling (HPA) is another Kubernetes technique to -automatically add, and remove, additional `coderd` pods when the existing pods -exceed sustained CPU and memory thresholds. Consult -[Kubernetes HPA documentation](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) -for the various API version implementations of HPA. +We do not recommend using [Horizontal Pod Autoscaling](https://kubernetes.io/docs/tasks/run-application/horizontal-pod-autoscale/) +with Coder. In some environments, this will lead to errors with workspace builds. From b7ebf34cbca9c1e7140a0ac7a2fbc83958a32610 Mon Sep 17 00:00:00 2001 From: Ben Date: Fri, 21 Oct 2022 15:51:34 +0000 Subject: [PATCH 2/2] lint --- admin/git.md | 2 +- workspaces/editors.md | 25 +++++++++++++------------ 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/admin/git.md b/admin/git.md index 5d4adf8db..d9dea2d53 100644 --- a/admin/git.md +++ b/admin/git.md @@ -129,7 +129,7 @@ When done, click **Save**. ### Built-in GitHub Integration (VS Code) Alternatively, users can VS Code's -[built-in GitHub integration](https://code.visualstudio.com/docs/sourcecontrol/github) +[built-in GitHub integration](https://code.visualstudio.com/docs/sourcecontrol/github) in order to clone repositories within VS Code Remote and code-server. This uses a GitHub token to authenticate instead of SSH keys. diff --git a/workspaces/editors.md b/workspaces/editors.md index 8bc86113e..d70d583c2 100644 --- a/workspaces/editors.md +++ b/workspaces/editors.md @@ -37,9 +37,9 @@ from your local VS Code, connected to your Coder workspace for compute, etc. > `remote.SSH.allowLocalServerDownload` enabled so the extension will install > the VS Code Server on the client first and then copy it over to the Coder > workspace via SCP. -> -> For further troubleshooting steps, see [Troubleshooting hanging or failing -> connections](https://code.visualstudio.com/docs/remote/troubleshooting#_troubleshooting-hanging-or-failing-connections) +> +> For further troubleshooting steps, see +> [Troubleshooting hanging or failing connections](https://code.visualstudio.com/docs/remote/troubleshooting#_troubleshooting-hanging-or-failing-connections) ![VS Code Remote Explorer](../assets/workspaces/vscode-remote-ssh-panel.png) @@ -328,8 +328,8 @@ for setting up your custom image and configure script. Jupyter Notebook is the original web IDE for creating Notebooks used in data science, machine learning and analytics projects. By default, any Coder -workspace with the Jupyter project installed (in `/usr/local/bin/jupyter`) -will render the icon to launch Jupyter Notebook. +workspace with the Jupyter project installed (in `/usr/local/bin/jupyter`) will +render the icon to launch Jupyter Notebook. ![Jupyter Notework](../assets/workspaces/jupyter-notebook-icon.png) @@ -378,8 +378,9 @@ RUN chmod +x jupyter USER coder ``` -Below is an example `jupyter` script with the lab arguments. This file must -be located in the same directory as the Dockerfile to be copied during `docker build` +Below is an example `jupyter` script with the lab arguments. This file must be +located in the same directory as the Dockerfile to be copied during +`docker build` ```sh #!/bin/bash @@ -391,10 +392,10 @@ args=${args/notebook/"lab"} jupyter.py ${args} ``` -The second method to run JupyterLab is with a dev URL and launching -JupyterLab via `supervisord` in the `configure` script. The benefit of this -approach is it is completely independent of Coder's IDE launching mechanism -and relies only on a generic dev URL. +The second method to run JupyterLab is with a dev URL and launching JupyterLab +via `supervisord` in the `configure` script. The benefit of this approach is it +is completely independent of Coder's IDE launching mechanism and relies only on +a generic dev URL. ![JupyterLab as a dev URL](../assets/workspaces/jupyterlab-as-devurl.png) @@ -448,7 +449,7 @@ directory=/home/coder The third method to access JupyterLab is locally using the SSH port forward command: `ssh -L 8888:localhost:8888 coder.jupyterlab`. Alternatively, you can use the Coder CLI to port forward using: `coder tunnel jupyterlab 8888 8888`. -Now, open a local browser and navigate to `https://localhost:8888`. +Now, open a local browser and navigate to `https://localhost:8888`. ## RStudio