Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DH-227] apply changes from running pre-commit run --all-files #6386

Merged
merged 4 commits into from
Oct 18, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/featurerequest.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,4 +30,3 @@ assignees:
# Tasks to complete

<!-- What tasks are needed to make this enhancement? -->

1 change: 0 additions & 1 deletion .github/ISSUE_TEMPLATE/higher-resources.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,4 +45,3 @@ This will help us with the prioritization of this request.
This will help us scale down resources when the RAM increase is no longer required

**Any additional information we should know about?**

4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/performance_issue.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ body:
- type: markdown
attributes:
value: |
Please refer to the commmon causes for the performance issues by referring to this documentation - https://ds-modules.github.io/curriculum-guide/workflow/performance_issue.html. If the above mentioned reasons are not the cause for the performance issues in the hub then or you lack clarity about the issue then please do raise a request by filling the details below:
Please refer to the common causes for the performance issues by referring to this documentation - https://ds-modules.github.io/curriculum-guide/workflow/performance_issue.html. If the above mentioned reasons are not the cause for the performance issues in the hub then or you lack clarity about the issue then please do raise a request by filling the details below:
- type: dropdown
attributes:
label: Your Role
Expand Down Expand Up @@ -91,7 +91,7 @@ body:
- type: input
attributes:
label: Issue timeline
description: Mention the date/time when this issue occured
description: Mention the date/time when this issue occurred
validations:
required: true
- type: textarea
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/resourcescheduler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ body:
label: Detailed Requirements
description: Rationale for requesting increased compute
value: |
- <!--Eg: Conducting Live Workshops/Exams/Flipped Clasroom(s) or due to Deadline for Compute Intensive Assignment-->
- <!--Eg: Conducting Live Workshops/Exams/Flipped Classroom(s) or due to Deadline for Compute Intensive Assignment-->
validations:
required: true
- type: dropdown
Expand All @@ -40,7 +40,7 @@ body:
- type: textarea
attributes:
label: Request Deadline
description: Sepcify the time duration for which you are expecting this increase in compute
description: Specify the time duration for which you are expecting this increase in compute
value: |
<!-- Specify the start date/time and end date/time -->
validations:
Expand Down
2 changes: 1 addition & 1 deletion deployments/a11y/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/astro/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/biology/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/cee/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/data100/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/data101/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/data102/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/datahub/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/dev/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/dlab/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 0 additions & 2 deletions deployments/edx/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,5 +77,3 @@ jupyterhub:
extraEnv:
# Unset NotebookApp from hub/values. Necessary for recent lab versions.
JUPYTERHUB_SINGLEUSER_APP: "jupyter_server.serverapp.ServerApp"


2 changes: 0 additions & 2 deletions deployments/edx/hubploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,3 @@ cluster:
service_key: gcloud-service-key.json
cluster: edx
zone: us-central1


2 changes: 1 addition & 1 deletion deployments/edx/secrets/gcloud-service-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/eecs/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -103,4 +103,4 @@ jupyterhub:

course::1537177: # ELENG 120, https://github.com/berkeley-dsep-infra/datahub/issues/6015
mem_limit: 4096M
mem_guarantee: 4096M
mem_guarantee: 4096M
2 changes: 1 addition & 1 deletion deployments/eecs/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/gradebook/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/highschool/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/ischool/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/julia/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/logodev/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/nature/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/prob140/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/publichealth/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
1 change: 0 additions & 1 deletion deployments/r/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -99,4 +99,3 @@ jupyterhub:
course::1537932: # Data C131A, https://github.com/berkeley-dsep-infra/datahub/issues/6121
mem_limit: 2048M
mem_guarantee: 2048M

2 changes: 1 addition & 1 deletion deployments/r/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/shiny/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/stat159/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/stat20/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/ugr01/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
2 changes: 1 addition & 1 deletion deployments/workshop/secrets/gke-key.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
"unencrypted_suffix": "_unencrypted",
"version": "3.7.0"
}
}
}
11 changes: 5 additions & 6 deletions dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# allow for base image specification in hubploy.yaml
git+https://github.com/berkeley-dsep-infra/hubploy.git
pygithub
pyrsistent==0.19.3
attrs==23.1.0
chardet
chartpress
git+https://github.com/berkeley-dsep-infra/hubploy.git
jupyter-repo2docker==2024.07.0
myst-parser
chardet
niquests==3.7.2
pre-commit==4.0.1
pygithub
pyrsistent==0.19.3
urllib3<2.0.0
yamllint==1.35.1
pre-commit==4.0.1
2 changes: 1 addition & 1 deletion docs/admins/cluster-config.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ In our experience, Google Kubernetes Engine (GKE) has been the most
stable, performant, and reliable managed kubernetes service. We prefer
running on this when possible.

A `gcloud container clusters create` command can succintly express the
A `gcloud container clusters create` command can succinctly express the
configuration of our kubernetes cluster. The following command
represents the currently favored configuration.

Expand Down
2 changes: 1 addition & 1 deletion docs/admins/howto/calendar-scaler.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Here is an example of how you can test any changes to
`scaler/calendar.py` locally in the python interpreter:

``` python
# these tests will use somes dates culled from the calendar with varying numbers of events.
# these tests will use some dates culled from the calendar with varying numbers of events.
import scaler.calendar
import datetime
import zoneinfo
Expand Down
6 changes: 3 additions & 3 deletions docs/admins/howto/course-config.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ title: Course Configuration

## Allocating Resources

It is possible to alter administrative priviliges or resources
It is possible to alter administrative privileges or resources
allocations (such as memory or extra volumes) of user servers from
within the deployment configuration. This is mostly useful for when
resources need to be increased based on users\' class enrollments. The
Expand All @@ -30,7 +30,7 @@ Groups are named with the format
\"course::234567::enrollment_type::student\". Our custom kubespawner,
which we define in `hub/values.yaml`, reads users\' group
memberships prior to spawning. It then overrides various KubeSpawner
paramters based on configuration we define, using the canvas ID as the
parameters based on configuration we define, using the canvas ID as the
key. (see below)

Note that if a user is assigned to a new Canvas group (e.g. by the
Expand Down Expand Up @@ -96,7 +96,7 @@ with bCourse ID `1234567`. It assigns scopes for accessing
and administering the servers for users in group
`course::1234567`. Members of that group include all
students and course staff. It also assigns scopes for viewing lists of
users at /hub/admin. It assignes these scopes to members of the
users at /hub/admin. It assigns these scopes to members of the
affiliated course staff groups.

This stanza is more verbose than inserting lists of users under
Expand Down
4 changes: 2 additions & 2 deletions docs/admins/howto/managing-multiple-user-image-repos.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ options:
Commit message to use for the changes.
```

`stage` combines both `git add ...` and `git commit -m`, adding and commiting
`stage` combines both `git add ...` and `git commit -m`, adding and committing
one or more files to the staging area before you push to a remote.

The commit message must be a text string enclosed in quotes.
Expand Down Expand Up @@ -269,4 +269,4 @@ After staging, push everything to a remote:

```
manage-repos -c repos.txt -d ~/src/images push -b test-branch
```
```
4 changes: 2 additions & 2 deletions docs/admins/howto/new-hub.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ you can skip either or both of the following steps and pick back up at
the `cookiecutter`.

When creating a new hub, we also make sure to label the filestore and
GKE/node pool resouces with both `hub` and
GKE/node pool resources with both `hub` and
`<nodepool|filestore>-deployment`. 99.999% of the time, the values for
all three of these labels will be `<hubname>`.

Expand Down Expand Up @@ -331,7 +331,7 @@ will be used to allocate RAM for the node placeholder.
| egrep -v 'pause|notebook'
```

1. Subract the second number from the first, and then subtract another
1. Subtract the second number from the first, and then subtract another
277872640 bytes (256Mi) for "wiggle room".
2. Add an entry for the new placeholder node config in `values.yaml`:

Expand Down
2 changes: 1 addition & 1 deletion docs/admins/howto/new-packages.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ request that the change by installed for all users by by [creating a new
issue in
github](https://github.com/berkeley-dsep-infra/datahub/issues),contacting
cirriculum support staff, or creating a new pull request. Ultimately,
thouroughly testing changes locally and submitting a pull request will
thoroughly testing changes locally and submitting a pull request will
result in the software being rolled out to everyone much faster.

Install a python package in your notebook
Expand Down
2 changes: 1 addition & 1 deletion docs/admins/howto/rebuild-hub-image.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ which also updates `hub/values.yaml` with the new image version.
3. Run `chartpress --push`. This will build and push the hub image, and
modify `hub/values.yaml` appropriately.
4. Make a commit with the `hub/values.yaml` file, so the new hub image
name and tag are comitted.
name and tag are committed.
5. Proceed to deployment as normal.

Some of the following commands may be required to configure your
Expand Down
4 changes: 2 additions & 2 deletions docs/admins/howto/rebuild-postgres-image.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
title: "Customize the Per-User Postgres Docker Image"
---

We provide each student on `data100` witha postgresql server. We want the
We provide each student on `data100` with a postgresql server. We want the
[python extension](https://www.postgresql.org/docs/current/plpython.html)
installed. So we inherit from the [upstream postgresql docker
image](https://hub.docker.com/_/postgres), and add the appropriate
Expand All @@ -13,7 +13,7 @@ rebuild and push it.

1. Modify the image in `images/postgres` and make a git commit.
2. Run `chartpress --push`. This will build and push the image, *but
not put anything in YAML*. There is no place we can put thi in
not put anything in YAML*. There is no place we can put this in
`values.yaml`, since this is only used for data100.
3. Notice the image name + tag from the `chartpress --push` command,
and put it in the appropriate place (under `extraContainers`) in
Expand Down
2 changes: 1 addition & 1 deletion docs/datahub.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 0 additions & 2 deletions docs/incidents/2017-02-24-autoscaler-incident.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,3 @@ A cluster autoscaler script was accidentally run against the production cluster
### Future organizational change ###

1. Use a separate billing account for production vs development clusters. This makes it harder to accidentally run things on the wrong cluster


Loading
Loading