Skip to content

Commit

Permalink
Merge pull request #6322 from berkeley-dsep-infra/staging
Browse files Browse the repository at this point in the history
Merge 6317, 6318, 6319 and 6320 to prod
  • Loading branch information
shaneknapp authored Oct 2, 2024
2 parents 3ac3976 + c6cf54e commit 94e269d
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 195 deletions.
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/shared_directories.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Setup Shared/Shared-readwrite directories
name: Setup Shared directories
description: To store large datasets that can be read by student notebooks
labels: "support"
assignees:
Expand Down Expand Up @@ -68,7 +68,7 @@ body:
label: Shared Directory Name
description: What should be the name of the shared and shared-readwrite directories?
value: |
- <!-- Eg: coursename-shared and coursename-readwrite can be the directory names. Eg: compss-214a-readwrite and compss-214a-shared are the shared-readwrite and shared directories for the COMPSS-214A course -->
- <!-- Eg: coursename-shared and coursename-readwrite can be the directory names. Eg: data100-shared and data100-shared-readwrite are the shared and shared-readwrite directories for the Data100 course -->
validations:
required: true
- type: textarea
Expand Down
18 changes: 18 additions & 0 deletions deployments/data100/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,24 @@ jupyterhub:
course::1524699::group::all-admins:
admin: true
mem_limit: 4G

# Data C100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6316
course::1537664::enrollment_type::teacher:
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/data100-shared-readwrite
subPath: _shared/course/data100-shared-readwrite
course::1537664::enrollment_type::ta:
extraVolumeMounts:
- name: homes
mountPath: /home/jovyan/data100-shared-readwrite
subPath: _shared/course/data100-shared-readwrite
course::1537664::enrollment_type::student:
extraVolumeMounts:
- name: home
mountPath: /home/jovyan/data100-shared
subPath: _shared/course/data100-shared
readOnly: true
admin:
mem_guarantee: 2G
extraVolumeMounts:
Expand Down
93 changes: 0 additions & 93 deletions deployments/logodev/image/apt.txt

This file was deleted.

65 changes: 0 additions & 65 deletions deployments/logodev/image/environment.yml

This file was deleted.

29 changes: 0 additions & 29 deletions deployments/logodev/image/infra-requirements.txt

This file was deleted.

6 changes: 0 additions & 6 deletions deployments/logodev/image/postBuild

This file was deleted.

1 change: 1 addition & 0 deletions docs/_quarto.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ website:
- admins/howto/clusterswitch.qmd
- admins/howto/github-token.qmd
- admins/howto/google-sheets.qmd
- admins/howto/cheatsheet.qmd
- section: "Policy"
contents:
- policy/create_policy.qmd
Expand Down
29 changes: 29 additions & 0 deletions docs/admins/howto/cheatsheet.qmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
---
title: Operations Cheatsheet
---

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.

## Get Root Access in a User Pod

It can be useful to run commands as root in a user's pod to quickly install or reconfigure software. This could be done during the development of a PR to change a user image.

In this fragment, `local$` conveys operations performed on your own device and `node$` shows operations performed on the cloud node.

```bash
local$ pod=jupyter-username
local$ ns=datahub-prod

# Obtain and display the user's container ID
local$ cid=$(kubectl -n $ns get pod $pod -o jsonpath="{.status.containerStatuses[].containerID}" | sed 's,.*//,,')
local$ echo $cid

# ssh into the node hosting the user's pod, substituting `NODE_NAME`
local$ kubectl -n $ns get pod $pod -o wide
local$ gcloud compute ssh --zone us-central1-b --project ucb-datahub-2018 NODE_NAME

# Exec into the user's container as root, where `CID_FROM_ABOVE` is the
# value of $cid from above
node$ sudo -i
node# runc --root /run/containerd/runc/k8s.io/ exec -t -u 0 CID_FROM_ABOVE bash
```

0 comments on commit 94e269d

Please sign in to comment.