Merge pull request #5752 from ryanlovett/dev-convert

Rename dev-r hub and deployment to dev

.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

.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':

deployments/dev-r/config/common.yaml → deployments/dev/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."

deployments/dev-r/config/prod.yaml → deployments/dev/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:

deployments/dev-r/config/staging.yaml → deployments/dev/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

deployments/dev-r/hubploy.yaml → deployments/dev/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