Merge pull request #6412 from berkeley-dsep-infra/staging

merging 6405/6406/6407/6408/6409/6411 to prod
berkeley-dsep-infra · Oct 24, 2024 · 774b601 · 774b601
2 parents 52e998e + 157a5df
commit 774b601
Show file tree

Hide file tree

Showing 40 changed files with 194 additions and 313 deletions.
diff --git a/docs/_quarto.yml b/docs/_quarto.yml
@@ -13,12 +13,10 @@ website:
       - icon: github
         href: https://github.com/berkeley-dsep-infra/datahub
     left:
-      - text: "Using DataHub"
-        href: users/features.qmd
       - text: "Contributing"
         href: admins/pre-reqs.qmd
       - text: "Admin Tasks"
-        href: admins/howto/documentation.qmd
+        href: tasks/documentation.qmd
       - text: "Policy"
         href: policy/create_policy.qmd
   page-navigation: true
@@ -28,40 +26,36 @@ website:
     contents:
       - href: index.qmd
         text: Home
-      - section: "Using DataHub"
-        contents:
-          - users/features.qmd
-          - users/private-repo.qmd
-          - users/hubs.qmd
-          - users/authentication.qmd
+      - href: hubs.qmd
+        text: JupyterHub Deployments
       - section: "Contributing to DataHub"
         contents:
           - admins/pre-reqs.qmd
           - admins/structure.qmd
           - admins/storage.qmd
           - admins/cluster-config.qmd
           - admins/credentials.qmd
-          - section: "Common Administrator Tasks"
-            contents:
-              - admins/howto/documentation.qmd
-              - admins/howto/dns.qmd
-              - admins/howto/core-pool.qmd
-              - admins/howto/new-hub.qmd
-              - admins/howto/rebuild-hub-image.qmd
-              - admins/howto/rebuild-postgres-image.qmd
-              - admins/howto/managing-multiple-user-image-repos.qmd
-              - admins/howto/new-image.qmd
-              - admins/howto/transition-image.qmd
-              - admins/howto/new-packages.qmd
-              - admins/howto/course-config.qmd
-              - admins/howto/calendar-scaler.qmd
-              - admins/howto/prometheus-grafana.qmd
-              - admins/howto/remove-users-orm.qmd
-              - admins/howto/delete-hub.qmd
-              - admins/howto/clusterswitch.qmd
-              - admins/howto/github-token.qmd
-              - admins/howto/google-sheets.qmd
-              - admins/howto/cheatsheet.qmd
+      - section: "Common Administrator Tasks"
+        contents:
+          - tasks/documentation.qmd
+          - tasks/dns.qmd
+          - tasks/core-pool.qmd
+          - tasks/new-hub.qmd
+          - tasks/rebuild-hub-image.qmd
+          - tasks/rebuild-postgres-image.qmd
+          - tasks/managing-multiple-user-image-repos.qmd
+          - tasks/new-image.qmd
+          - tasks/transition-image.qmd
+          - tasks/new-packages.qmd
+          - tasks/course-config.qmd
+          - tasks/calendar-scaler.qmd
+          - tasks/prometheus-grafana.qmd
+          - tasks/remove-users-orm.qmd
+          - tasks/delete-hub.qmd
+          - tasks/clusterswitch.qmd
+          - tasks/github-token.qmd
+          - tasks/google-sheets.qmd
+          - tasks/cheatsheet.qmd
       - section: "Policy"
         contents:
           - policy/create_policy.qmd

diff --git a/docs/admins/howto/remove-users-orm.qmd b/docs/admins/howto/remove-users-orm.qmd
diff --git a/docs/users/hubs.qmd → docs/hubs.qmd b/docs/users/hubs.qmd → docs/hubs.qmd
diff --git a/docs/users/hubs/data100.qmd → docs/hubs/data100.qmd b/docs/users/hubs/data100.qmd → docs/hubs/data100.qmd
diff --git a/docs/users/hubs/data102.qmd → docs/hubs/data102.qmd b/docs/users/hubs/data102.qmd → docs/hubs/data102.qmd
diff --git a/docs/users/hubs/datahub.qmd → docs/hubs/datahub.qmd b/docs/users/hubs/datahub.qmd → docs/hubs/datahub.qmd
diff --git a/docs/users/hubs/edx.qmd → docs/hubs/edx.qmd b/docs/users/hubs/edx.qmd → docs/hubs/edx.qmd
diff --git a/docs/users/hubs/prob140.qmd → docs/hubs/prob140.qmd b/docs/users/hubs/prob140.qmd → docs/hubs/prob140.qmd
diff --git a/docs/users/hubs/r.qmd → docs/hubs/r.qmd b/docs/users/hubs/r.qmd → docs/hubs/r.qmd
diff --git a/docs/users/hubs/shiny.qmd → docs/hubs/shiny.qmd b/docs/users/hubs/shiny.qmd → docs/hubs/shiny.qmd
diff --git a/docs/users/hubs/stat159.qmd → docs/hubs/stat159.qmd b/docs/users/hubs/stat159.qmd → docs/hubs/stat159.qmd
diff --git a/docs/users/hubs/stat20.qmd → docs/hubs/stat20.qmd b/docs/users/hubs/stat20.qmd → docs/hubs/stat20.qmd
diff --git a/docs/admins/howto/calendar-scaler.qmd → docs/tasks/calendar-scaler.qmd b/docs/admins/howto/calendar-scaler.qmd → docs/tasks/calendar-scaler.qmd
@@ -1,5 +1,7 @@
 ---
 title: Calendar Node Pool Autoscaler
+aliases:
+  - ../admins/howto/calendar-scaler.html
 ---
 
 ## Why scale node pools with Google Calendar?

diff --git a/docs/admins/howto/cheatsheet.qmd → docs/tasks/cheatsheet.qmd b/docs/admins/howto/cheatsheet.qmd → docs/tasks/cheatsheet.qmd
@@ -1,5 +1,7 @@
 ---
 title: Operations Cheatsheet
+aliases:
+  - ../admins/howto/cheatsheet.html
 ---
 
 We periodically need to perform various tasks that can be quickly described by short shell fragments. This page is meant to be a dumping ground for them. It may be useful on occasion to move such fragments into more relevant pages.

diff --git a/docs/admins/howto/clusterswitch.qmd → docs/tasks/clusterswitch.qmd b/docs/admins/howto/clusterswitch.qmd → docs/tasks/clusterswitch.qmd
@@ -1,13 +1,15 @@
 ---
 title: Switching over a hub to a new cluster
+aliases:
+  - ../admins/howto/clusterswitch.html
 ---
 
 This document describes how to switch an existing hub to a new cluster.  The example used here refers to moving all UC Berkeley Datahubs.
 
 You might find it easier to switch to a new cluster if you're running a [very old k8s version](https://cloud.google.com/kubernetes-engine/docs/release-notes), or in lieu of performing a [cluster credential rotation](https://cloud.google.com/kubernetes-engine/docs/how-to/credential-rotation).  Sometimes starting from scratch is easier than an iterative and potentially destructive series of operations.
 
 ## Create a new cluster
-1. Create a new cluster using the specified [configuration](../cluster-config.qmd).
+1. Create a new cluster using the specified [configuration](../admins/cluster-config.qmd).
 2. Set up helm on the cluster according to the instructions here:  
    http://z2jh.jupyter.org/en/latest/setup-helm.html
      - Make sure the version of helm you're working with matches the version Github Actions is using.

diff --git a/docs/admins/howto/core-pool.qmd → docs/tasks/core-pool.qmd b/docs/admins/howto/core-pool.qmd → docs/tasks/core-pool.qmd
@@ -1,5 +1,7 @@
 ---
 title: Core Node Pool Management
+aliases:
+  - ../admins/howto/core-pool.html
 ---
 
 ## What is the core node pool?

diff --git a/docs/admins/howto/course-config.qmd → docs/tasks/course-config.qmd b/docs/admins/howto/course-config.qmd → docs/tasks/course-config.qmd
@@ -1,5 +1,7 @@
 ---
 title: Course Configuration
+aliases:
+  - ../admins/howto/course-config.html
 ---
 
 ## Allocating Resources

diff --git a/docs/admins/howto/delete-hub.qmd → docs/tasks/delete-hub.qmd b/docs/admins/howto/delete-hub.qmd → docs/tasks/delete-hub.qmd
@@ -1,5 +1,7 @@
 ---
 title: Delete or spin down a Hub
+aliases:
+  - ../admins/howto/delete-hub.html
 ---
 
 ## Why delete or spin down a hub?

diff --git a/docs/admins/howto/dns.qmd → docs/tasks/dns.qmd b/docs/admins/howto/dns.qmd → docs/tasks/dns.qmd
@@ -1,5 +1,7 @@
 ---
 title: Update DNS
+aliases:
+  - ../admins/howto/dns.html
 ---
 
 Some staff have access to make and update DNS entries in the

diff --git a/docs/admins/howto/documentation.qmd → docs/tasks/documentation.qmd b/docs/admins/howto/documentation.qmd → docs/tasks/documentation.qmd
@@ -1,5 +1,7 @@
 ---
 title: Documentation
+aliases:
+  - ../admins/howto/documentation.html
 ---
 
 ## Overview

diff --git a/docs/admins/howto/github-token.qmd → docs/tasks/github-token.qmd b/docs/admins/howto/github-token.qmd → docs/tasks/github-token.qmd
@@ -1,5 +1,7 @@
 ---
 title: Create Finely Grained Access Token
+aliases:
+  - ../admins/howto/github-token.html
 ---
 
 At <https://github.com/settings/personal-access-tokens/new>:

diff --git a/docs/admins/howto/google-sheets.qmd → docs/tasks/google-sheets.qmd b/docs/admins/howto/google-sheets.qmd → docs/tasks/google-sheets.qmd
@@ -1,5 +1,7 @@
 ---
 title: Reading Google Sheets from DataHub
+aliases:
+  - ../admins/howto/google-sheets.html
 ---
 
 Available in: DataHub

diff --git a/docs/admins/howto/index.qmd → docs/tasks/index.qmd b/docs/admins/howto/index.qmd → docs/tasks/index.qmd
@@ -1,3 +1,5 @@
 ---
 title: Common Administrator Tasks
+aliases:
+  - ../admins/howto/index.html
 ---