Merge branch 'main' into release-1.28

Author: Katie Horne

admin/workspace-management/cvms/index.md

@@ -17,6 +17,8 @@ deployment option.
   Kubernetes Node must run a supported Linux distro with the minimum kernel
   version. See
   [Sysbox distro compatibility](https://github.com/nestybox/sysbox/blob/master/docs/distro-compat.md)
+  and
+  [Sysbox User Guide: Design Notes](https://github.com/nestybox/sysbox/blob/master/docs/user-guide/design.md)
   for more information.
 
 - The cluster must allow privileged containers and `hostPath` mounts. See
@@ -28,6 +30,24 @@ deployment option.
 > [Google](../../../setup/kubernetes/google.md). Azure-hosted clusters will meet
 > these requirements as long as you use Kubernetes version 1.18+.
 
+### HostPath mounts
+
+The host paths required for CVM functionality depend on whether you've enabled
+**Caching** and **Auto loading of the `shiftfs` kernel module**. You can find
+these settings under **Manage > Admin > Infrastructure**.
+
+The following table documents the host paths that are mounted:
+
+<!-- markdownlint-disable -->
+
+| Caching | Auto Load `shiftfs` | `/usr/src` | `/lib/modules` | `/var/run` | `/var/lib` |
+| ------- | ------------------- | ---------- | -------------- | ---------- | ---------- |
+| Off     | N/A                 | Read-only  | Read-only      |            |            |
+| On      | Off                 | Read-only  | Read-only      | Read-only  | Read-write |
+| On      | On                  | Read-write | Read-write     | Read-only  | Read-write |
+
+<!-- markdownlint-restore -->
+
 ## Security
 
 The container-based virtual machine deployment option leverages the Sysbox

admin/workspace-management/shutdown.md

@@ -26,4 +26,7 @@ Click **Edit** in the top-right. In the dialog that opens, use the slider
 underneath **Workspace Shutdown Behavior** to select the maximum allowed
 duration.
 
+Select **User-controlled workspace shutdown behavior** if you'd like to allow
+users to set their desired shutdown behavior. This will override the org-level setting.
+
 ![Configure shutdown behavior](../../assets/admin/workspace-shutdown.png)

assets/admin/workspace-shutdown.png

@@ -163,7 +163,7 @@ support immediate volume binding.
 To create clusters allowing you to
 [enable container-based virtual machines (CVMs)](../../admin/workspace-management/cvms.md)
 as a workspace deployment option, you'll need to
-[create a nodegroup](https://eksctl.io/usage/managing-nodegroups/#creating-a-nodegroup-from-a-config-file).
+[create a nodegroup](https://eksctl.io/usage/eks-managed-nodes/#creating-managed-nodegroups).
 
 1. Define your config file (we've named the file `coder-node.yaml`, but you can
    call it whatever you'd like):
@@ -177,10 +177,17 @@ as a workspace deployment option, you'll need to
      name: <YOUR_CLUSTER_NAME>
      region: <YOUR_AWS_REGION>
 
-   nodeGroups:
+   managedNodeGroups:
      - name: coder-node-group
        amiFamily: Ubuntu2004
        ami: <your Ubuntu 20.04 AMI ID>
+       instanceType: <instance-type>
+       minSize: 1
+       mazSize: 2
+       desiredCapacity: 1
+       overrideBootstrapCommand: |
+      #!/bin/bash -xe
+      sudo /etc/eks/bootstrap.sh --apiserver-endpoint '' --b64-cluster-ca 'LS0tLS1...LS0tCg==' '<cluster-name>'
    ```
 
 > [See here for a list of EKS-compatible Ubuntu AMIs](https://cloud-images.ubuntu.com/docs/aws/eks/)

setup/kubernetes/aws.md

@@ -94,8 +94,9 @@ set your resource allocation.
     <tr>
         <td><b>Auto-off</b></td>
         <td>The amount of time your workspace can be idle before Coder stops
-        the workspace. Available only if your site manager has allowed this
-        setting to be changed at the user level (otherwise the organization
+        the workspace. Available only <a href="../admin/workspace-management/shutdown.md#configuring-workspace-shutdown-behavior">if
+        your site manager has allowed this
+        setting to be changed at the user level</a> (otherwise the organization
         default applies).</td>
     </tr>
 </table>