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

merging 6460/6463/6464/6465 to prod #6466

Merged
merged 10 commits into from
Nov 8, 2024
12 changes: 6 additions & 6 deletions deployments/data100/config/common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,18 +41,18 @@ jupyterhub:
# this role will be assigned to...
groups:
- course::1524699::group::all-admins
#Data 100, Summer 2024, https://github.com/berkeley-dsep-infra/datahub/issues/5802
course-staff-1535115:
#Data 100, Fall 2024, https://github.com/berkeley-dsep-infra/datahub/issues/6458
course-staff-1537664:
# description: Enable course staff to view and access servers.
# this role provides permissions to...
scopes:
- admin-ui
- list:users!group=course::1535115
- admin:servers!group=course::1535115
- access:servers!group=course::1535115
- list:users!group=course::1537664
- admin:servers!group=course::1537664
- access:servers!group=course::1537664
# this role will be assigned to...
groups:
- course::1535115::group::Admins
- course::1537664::group::Admins
# Econ 148, Spring 2024, DH-225
#course-staff-1532866:
# description: Enable course staff to view and access servers.
Expand Down
2 changes: 1 addition & 1 deletion deployments/data100/hubploy.yaml
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/data100-user-image:511c4637d702
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/data100-user-image:9767c87d1084

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/datahub/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/dlab/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5
path: ../datahub/images/default

cluster:
Expand Down
2 changes: 1 addition & 1 deletion deployments/highschool/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5
path: ../datahub/images/default

cluster:
Expand Down
2 changes: 1 addition & 1 deletion deployments/prob140/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/r/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5

cluster:
provider: gcloud
Expand Down
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5

cluster:
provider: gcloud
Expand Down
2 changes: 1 addition & 1 deletion deployments/workshop/hubploy.yaml
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/datahub-user-image:34f4eb103e6a
- name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/datahub-user-image:c8ba144738b5

cluster:
provider: gcloud
Expand Down
2 changes: 2 additions & 0 deletions docs/admins/cluster-config.qmd
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ gcloud container clusters create \
--enable-network-policy \
--create-subnetwork="" \
--tags=hub-cluster \
--no-enable-insecure-kubelet-readonly-port \
<cluster-name>
```

Expand All @@ -57,6 +58,7 @@ gcloud container node-pools create \
--no-enable-autoupgrade \
--tags=hub-cluster \
--cluster=<cluster-name> \
--no-enable-insecure-kubelet-readonly-port \
user-<pool-name>-<yyyy>-<mm>-<dd>
```

Expand Down
Loading