From 08ef990c02d53eb36c0afdfd6720444a34908ed6 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Tue, 21 May 2024 15:43:50 -0700 Subject: [PATCH 1/2] Rename dev-r hubs to dev. --- .circleci/config.yml | 14 +++++++------- .github/labeler.yml | 4 ++-- deployments/dev-r/config/common.yaml | 4 ++-- deployments/dev-r/config/prod.yaml | 6 +++--- deployments/dev-r/config/staging.yaml | 6 +++--- deployments/dev-r/hubploy.yaml | 4 ++-- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4df87009f..00032e729 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -236,9 +236,9 @@ jobs: no_output_timeout: 30m - run: - name: Deploy dev-r + name: Deploy dev command: | - hubploy deploy --timeout 30m dev-r hub ${CIRCLE_BRANCH} + hubploy deploy --timeout 30m dev hub ${CIRCLE_BRANCH} no_output_timeout: 30m - run: @@ -538,8 +538,8 @@ workflows: # This has no effect yet because docker-py doesn't support buildkit. #environment: # DOCKER_BUILDKIT: 1 - deployment: dev-r - name: dev-r image build + deployment: dev + name: dev image build filters: branches: ignore: @@ -701,8 +701,8 @@ workflows: only: - staging - hubploy/build-image: - deployment: dev-r - name: dev-r image build + deployment: dev + name: dev image build push: true # Filters can only be per-job? wtf filters: @@ -805,7 +805,7 @@ workflows: - data101 image build - data102 image build - datahub image build - - dev-r image build + - dev image build - edx image build - eecs image build - ischool image build diff --git a/.github/labeler.yml b/.github/labeler.yml index 54ea56eff..7d76422a4 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -101,8 +101,8 @@ node-placeholder-scaler: - 'deployments/datahub/**' 'hub: dlab': - 'deployments/dlab/**' -'hub: dev-r': - - 'deployments/dev-r/**' +'hub: dev': + - 'deployments/dev/**' 'hub: edx': - 'deployments/edx/**' 'hub: eecs': diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev-r/config/common.yaml index 0d180181d..90cb67801 100644 --- a/deployments/dev-r/config/common.yaml +++ b/deployments/dev-r/config/common.yaml @@ -64,12 +64,12 @@ jupyterhub: defaultUrl: /rstudio profileList: - display_name: "Dockerfile image" - description: "This is the original dev-r image." + description: "This is the original dev image." default: true - display_name: "repo2docker image" description: "A newer repo2docker-based image with similar components as the primary." kubespawner_override: - image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-secondary:1a64e0a + image: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary:1a64e0a - display_name: "1524699: DataHub Infrastructure" slug: "1524699" description: "Regular image with per-course subpath." diff --git a/deployments/dev-r/config/prod.yaml b/deployments/dev-r/config/prod.yaml index cd639e48a..3f65b43cf 100644 --- a/deployments/dev-r/config/prod.yaml +++ b/deployments/dev-r/config/prod.yaml @@ -1,16 +1,16 @@ nfsPVC: nfs: - shareName: shares/dev-r/prod + shareName: shares/dev/prod jupyterhub: ingress: enabled: true hosts: - - dev-r.datahub.berkeley.edu + - dev.datahub.berkeley.edu tls: - secretName: tls-cert hosts: - - dev-r.datahub.berkeley.edu + - dev.datahub.berkeley.edu hub: db: pvc: diff --git a/deployments/dev-r/config/staging.yaml b/deployments/dev-r/config/staging.yaml index 2999ee041..08f3c3ca2 100644 --- a/deployments/dev-r/config/staging.yaml +++ b/deployments/dev-r/config/staging.yaml @@ -1,6 +1,6 @@ nfsPVC: nfs: - shareName: shares/dev-r/staging + shareName: shares/dev/staging jupyterhub: scheduling: @@ -12,8 +12,8 @@ jupyterhub: ingress: enabled: true hosts: - - dev-r-staging.datahub.berkeley.edu + - dev-staging.datahub.berkeley.edu tls: - secretName: tls-cert hosts: - - dev-r-staging.datahub.berkeley.edu + - dev-staging.datahub.berkeley.edu diff --git a/deployments/dev-r/hubploy.yaml b/deployments/dev-r/hubploy.yaml index ba6a74b59..73a41f621 100644 --- a/deployments/dev-r/hubploy.yaml +++ b/deployments/dev-r/hubploy.yaml @@ -1,8 +1,8 @@ images: images: - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-user-image + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-user-image path: images/default - - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-r-secondary + - name: us-central1-docker.pkg.dev/ucb-datahub-2018/user-images/dev-secondary path: images/secondary repo2docker: base_image: docker.io/library/buildpack-deps:jammy From 8d3dffd8eddf326a0a3fd5a61b708f7bb30f0a63 Mon Sep 17 00:00:00 2001 From: Ryan Lovett Date: Tue, 21 May 2024 15:48:37 -0700 Subject: [PATCH 2/2] Rename deployment directory. --- deployments/{dev-r => dev}/config/common.yaml | 0 deployments/{dev-r => dev}/config/prod.yaml | 0 deployments/{dev-r => dev}/config/staging.yaml | 0 deployments/{dev-r => dev}/hubploy.yaml | 0 deployments/{dev-r => dev}/images/default/Dockerfile | 0 deployments/{dev-r => dev}/images/default/Rprofile.site | 0 deployments/{dev-r => dev}/images/default/apt.txt | 0 deployments/{dev-r => dev}/images/default/class-libs.R | 0 deployments/{dev-r => dev}/images/default/environment.yml | 0 deployments/{dev-r => dev}/images/default/infra-requirements.txt | 0 deployments/{dev-r => dev}/images/default/install-mambaforge.bash | 0 deployments/{dev-r => dev}/images/default/install.R | 0 deployments/{dev-r => dev}/images/default/rsession.conf | 0 deployments/{dev-r => dev}/images/secondary/Rprofile.site | 0 deployments/{dev-r => dev}/images/secondary/apt.txt | 0 deployments/{dev-r => dev}/images/secondary/environment.yml | 0 .../{dev-r => dev}/images/secondary/infra-requirements.txt | 0 deployments/{dev-r => dev}/images/secondary/install.R | 0 deployments/{dev-r => dev}/images/secondary/rsession.conf | 0 deployments/{dev-r => dev}/images/secondary/runtime.txt | 0 deployments/{dev-r => dev}/secrets/gcr-key.json | 0 deployments/{dev-r => dev}/secrets/gke-key.json | 0 deployments/{dev-r => dev}/secrets/prod.yaml | 0 deployments/{dev-r => dev}/secrets/staging.yaml | 0 24 files changed, 0 insertions(+), 0 deletions(-) rename deployments/{dev-r => dev}/config/common.yaml (100%) rename deployments/{dev-r => dev}/config/prod.yaml (100%) rename deployments/{dev-r => dev}/config/staging.yaml (100%) rename deployments/{dev-r => dev}/hubploy.yaml (100%) rename deployments/{dev-r => dev}/images/default/Dockerfile (100%) rename deployments/{dev-r => dev}/images/default/Rprofile.site (100%) rename deployments/{dev-r => dev}/images/default/apt.txt (100%) rename deployments/{dev-r => dev}/images/default/class-libs.R (100%) rename deployments/{dev-r => dev}/images/default/environment.yml (100%) rename deployments/{dev-r => dev}/images/default/infra-requirements.txt (100%) rename deployments/{dev-r => dev}/images/default/install-mambaforge.bash (100%) rename deployments/{dev-r => dev}/images/default/install.R (100%) rename deployments/{dev-r => dev}/images/default/rsession.conf (100%) rename deployments/{dev-r => dev}/images/secondary/Rprofile.site (100%) rename deployments/{dev-r => dev}/images/secondary/apt.txt (100%) rename deployments/{dev-r => dev}/images/secondary/environment.yml (100%) rename deployments/{dev-r => dev}/images/secondary/infra-requirements.txt (100%) rename deployments/{dev-r => dev}/images/secondary/install.R (100%) rename deployments/{dev-r => dev}/images/secondary/rsession.conf (100%) rename deployments/{dev-r => dev}/images/secondary/runtime.txt (100%) rename deployments/{dev-r => dev}/secrets/gcr-key.json (100%) rename deployments/{dev-r => dev}/secrets/gke-key.json (100%) rename deployments/{dev-r => dev}/secrets/prod.yaml (100%) rename deployments/{dev-r => dev}/secrets/staging.yaml (100%) diff --git a/deployments/dev-r/config/common.yaml b/deployments/dev/config/common.yaml similarity index 100% rename from deployments/dev-r/config/common.yaml rename to deployments/dev/config/common.yaml diff --git a/deployments/dev-r/config/prod.yaml b/deployments/dev/config/prod.yaml similarity index 100% rename from deployments/dev-r/config/prod.yaml rename to deployments/dev/config/prod.yaml diff --git a/deployments/dev-r/config/staging.yaml b/deployments/dev/config/staging.yaml similarity index 100% rename from deployments/dev-r/config/staging.yaml rename to deployments/dev/config/staging.yaml diff --git a/deployments/dev-r/hubploy.yaml b/deployments/dev/hubploy.yaml similarity index 100% rename from deployments/dev-r/hubploy.yaml rename to deployments/dev/hubploy.yaml diff --git a/deployments/dev-r/images/default/Dockerfile b/deployments/dev/images/default/Dockerfile similarity index 100% rename from deployments/dev-r/images/default/Dockerfile rename to deployments/dev/images/default/Dockerfile diff --git a/deployments/dev-r/images/default/Rprofile.site b/deployments/dev/images/default/Rprofile.site similarity index 100% rename from deployments/dev-r/images/default/Rprofile.site rename to deployments/dev/images/default/Rprofile.site diff --git a/deployments/dev-r/images/default/apt.txt b/deployments/dev/images/default/apt.txt similarity index 100% rename from deployments/dev-r/images/default/apt.txt rename to deployments/dev/images/default/apt.txt diff --git a/deployments/dev-r/images/default/class-libs.R b/deployments/dev/images/default/class-libs.R similarity index 100% rename from deployments/dev-r/images/default/class-libs.R rename to deployments/dev/images/default/class-libs.R diff --git a/deployments/dev-r/images/default/environment.yml b/deployments/dev/images/default/environment.yml similarity index 100% rename from deployments/dev-r/images/default/environment.yml rename to deployments/dev/images/default/environment.yml diff --git a/deployments/dev-r/images/default/infra-requirements.txt b/deployments/dev/images/default/infra-requirements.txt similarity index 100% rename from deployments/dev-r/images/default/infra-requirements.txt rename to deployments/dev/images/default/infra-requirements.txt diff --git a/deployments/dev-r/images/default/install-mambaforge.bash b/deployments/dev/images/default/install-mambaforge.bash similarity index 100% rename from deployments/dev-r/images/default/install-mambaforge.bash rename to deployments/dev/images/default/install-mambaforge.bash diff --git a/deployments/dev-r/images/default/install.R b/deployments/dev/images/default/install.R similarity index 100% rename from deployments/dev-r/images/default/install.R rename to deployments/dev/images/default/install.R diff --git a/deployments/dev-r/images/default/rsession.conf b/deployments/dev/images/default/rsession.conf similarity index 100% rename from deployments/dev-r/images/default/rsession.conf rename to deployments/dev/images/default/rsession.conf diff --git a/deployments/dev-r/images/secondary/Rprofile.site b/deployments/dev/images/secondary/Rprofile.site similarity index 100% rename from deployments/dev-r/images/secondary/Rprofile.site rename to deployments/dev/images/secondary/Rprofile.site diff --git a/deployments/dev-r/images/secondary/apt.txt b/deployments/dev/images/secondary/apt.txt similarity index 100% rename from deployments/dev-r/images/secondary/apt.txt rename to deployments/dev/images/secondary/apt.txt diff --git a/deployments/dev-r/images/secondary/environment.yml b/deployments/dev/images/secondary/environment.yml similarity index 100% rename from deployments/dev-r/images/secondary/environment.yml rename to deployments/dev/images/secondary/environment.yml diff --git a/deployments/dev-r/images/secondary/infra-requirements.txt b/deployments/dev/images/secondary/infra-requirements.txt similarity index 100% rename from deployments/dev-r/images/secondary/infra-requirements.txt rename to deployments/dev/images/secondary/infra-requirements.txt diff --git a/deployments/dev-r/images/secondary/install.R b/deployments/dev/images/secondary/install.R similarity index 100% rename from deployments/dev-r/images/secondary/install.R rename to deployments/dev/images/secondary/install.R diff --git a/deployments/dev-r/images/secondary/rsession.conf b/deployments/dev/images/secondary/rsession.conf similarity index 100% rename from deployments/dev-r/images/secondary/rsession.conf rename to deployments/dev/images/secondary/rsession.conf diff --git a/deployments/dev-r/images/secondary/runtime.txt b/deployments/dev/images/secondary/runtime.txt similarity index 100% rename from deployments/dev-r/images/secondary/runtime.txt rename to deployments/dev/images/secondary/runtime.txt diff --git a/deployments/dev-r/secrets/gcr-key.json b/deployments/dev/secrets/gcr-key.json similarity index 100% rename from deployments/dev-r/secrets/gcr-key.json rename to deployments/dev/secrets/gcr-key.json diff --git a/deployments/dev-r/secrets/gke-key.json b/deployments/dev/secrets/gke-key.json similarity index 100% rename from deployments/dev-r/secrets/gke-key.json rename to deployments/dev/secrets/gke-key.json diff --git a/deployments/dev-r/secrets/prod.yaml b/deployments/dev/secrets/prod.yaml similarity index 100% rename from deployments/dev-r/secrets/prod.yaml rename to deployments/dev/secrets/prod.yaml diff --git a/deployments/dev-r/secrets/staging.yaml b/deployments/dev/secrets/staging.yaml similarity index 100% rename from deployments/dev-r/secrets/staging.yaml rename to deployments/dev/secrets/staging.yaml