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.

Sign up for GitHub

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

merging 6161/6169/6170 to prod #6171

Merged
merged 9 commits into from
Sep 12, 2024
Merged

merging 6161/6169/6170 to prod #6171

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b2e4abc
Adjust formatting in places.
ryanlovett Sep 11, 2024
b088e33
Merge pull request #6161 from ryanlovett/docs-transition-tweak
ryanlovett Sep 11, 2024
7042817
bumping chp ram again
shaneknapp Sep 12, 2024
ac8b37e
target three worst behaving hubs
shaneknapp Sep 12, 2024
da4bff4
update nature image tag to c248c1ca947c: deployments/nature/hubploy.yaml
Sep 12, 2024
4dd047d
stupid copy pasta buffer
shaneknapp Sep 12, 2024
0518661
remove unused file
shaneknapp Sep 12, 2024
d5a345a
Merge pull request #6169 from shaneknapp/bump-chp-ram-limit
felder Sep 12, 2024
3404261
Merge pull request #6170 from berkeley-dsep-infra/update-nature-image…
felder Sep 12, 2024
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
9 changes: 9 additions & 0 deletions deployments/data100/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@ jupyterhub:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
resources:
requests:
# FIXME: We want no guarantees here!!!
# This is lowest possible value
cpu: 0.001
memory: 3Gi
limits:
memory: 3Gi

hub:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
Expand Down
9 changes: 9 additions & 0 deletions deployments/data8/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,15 @@ jupyterhub:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
resources:
requests:
# FIXME: We want no guarantees here!!!
# This is lowest possible value
cpu: 0.001
memory: 3Gi
limits:
memory: 3Gi

traefik:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
Expand Down
9 changes: 9 additions & 0 deletions deployments/datahub/config/common.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,15 @@ jupyterhub:
chp:
nodeSelector:
hub.jupyter.org/pool-name: core-pool-2024-05-08
resources:
requests:
# FIXME: We want no guarantees here!!!
# This is lowest possible value
cpu: 0.001
memory: 3Gi
limits:
memory: 3Gi

singleuser:
extraEnv:
GH_SCOPED_CREDS_CLIENT_ID: Iv23ct7Qx1mAotaIIYx9
Expand Down
2 changes: 1 addition & 1 deletion deployments/nature/hubploy.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
images:
images:
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:00512349345a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/nature-user-image:c248c1ca947c

cluster:
provider: gcloud
Expand Down
12 changes: 6 additions & 6 deletions docs/admins/howto/transition-image.qmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ You will need to install `git-filter-repo`.

```bash
wget -O ~/bin/git-filter-repo https://raw.githubusercontent.com/newren/git-filter-repo/main/git-filter-repo
chmod +x ~/bin/git-filter-repo
chmod +x ~/bin/git-filter-repo
```

## Create the repository
Expand All @@ -23,7 +23,7 @@ wget -O ~/bin/git-filter-repo https://raw.githubusercontent.com/newren/git-filte
1. Click create repository.
1. In the new repository, visit Settings > Secrets and variables > Actions > Variables tab. Create new variables:
a. Set HUB to the hub deployment, e.g. `shiny`.
b. Set IMAGE to ucb-datahub-2018/user-images/{hub}-user-image, e.g. `ucb-datahub-2018/user-images/shiny-user-image`.
b. Set IMAGE to `ucb-datahub-2018/user-images/{hub}-user-image`, e.g. `ucb-datahub-2018/user-images/shiny-user-image`.
1. Fork the new image repo into your own github account.

## Preparing working directories
Expand Down Expand Up @@ -61,14 +61,14 @@ As part of this process, we will pull the previous image's git history into the

## Preparing continuous integration

1. In the berkeley-dsep-infra org settings, https://github.com/organizations/berkeley-dsep-infra/settings/profile, visit Secrets and variables > Actions, https://github.com/organizations/berkeley-dsep-infra/settings/secrets/actions. Edit the secrets for DATAHUB_CREATE_PR and GAR_SECRET_KEY, and enable the new repo to access each.
1. In the [berkeley-dsep-infra org settings](https://github.com/organizations/berkeley-dsep-infra/settings/profile), visit [Secrets and variables > Actions](https://github.com/organizations/berkeley-dsep-infra/settings/secrets/actions). Edit the secrets for `DATAHUB_CREATE_PR` and `GAR_SECRET_KEY`, and enable the new repo to access each.

1. In the datahub repo, in one PR:
a. remove the hub deployment steps for the hub:
- Deploy {hub}
- hubploy/build-image {hub} image build (x2)
- *Deploy {hub}*
- *hubploy/build-image {hub} image build* (x2)

a. under `deployments/{hub}/hubploy.yaml`, remove the registry entry, and set the image_name to have `PLACEHOLDER` for the tag.
a. under `deployments/{hub}/hubploy.yaml`, remove the registry entry, and set the `image_name` to have `PLACEHOLDER` for the tag.

a. In the datahub repo, under the deployment image directory, update the README to point to the new repo. Delete everything else in the image directory.

Expand Down
Loading