Merge pull request 2i2c-org#4517 from sgibson91/rename-awi-ciroh-2

Rename awi-ciroh-2 files and cleanup

.github/workflows/deploy-grafana-dashboards.yaml

@@ -22,7 +22,7 @@ jobs:
           - cluster_name: 2i2c
           - cluster_name: 2i2c-aws-us
           - cluster_name: 2i2c-uk
-          - cluster_name: awi-ciroh-2
+          - cluster_name: awi-ciroh
           - cluster_name: catalystproject-africa
           - cluster_name: catalystproject-latam
           - cluster_name: cloudbank

.github/workflows/deploy-hubs.yaml

@@ -230,7 +230,7 @@ jobs:
       failure_2i2c-aws-us: "${{ env.failure_2i2c-aws-us }}"
       failure_2i2c-uk: "${{ env.failure_2i2c-uk }}"
       failure_2i2c: "${{ env.failure_2i2c }}"
-      failure_awi-ciroh-2: "${{ env.failure_awi-ciroh-2 }}"
+      failure_awi-ciroh: "${{ env.failure_awi-ciroh }}"
       failure_catalystproject-africa: "${{ env.failure_catalystproject-africa }}"
       failure_catalystproject-latam: "${{ env.failure_catalystproject-latam }}"
       failure_cloudbank: "${{ env.failure_cloudbank }}"

config/clusters/awi-ciroh-2/cluster.yaml → config/clusters/awi-ciroh/cluster.yaml

@@ -1,4 +1,4 @@
-name: awi-ciroh-2
+name: awi-ciroh
 provider: gcp # https://console.cloud.google.com/home/dashboard?&project=ciroh-jupyterhub-423218
 gcp:
   key: enc-deployer-credentials.secret.json
@@ -14,15 +14,15 @@ support:
 hubs:
   - name: staging
     display_name: "Alabama Water Institute: CIROH (staging)"
-    domain: staging.ciroh2.awi.2i2c.cloud
+    domain: staging.ciroh.awi.2i2c.cloud
     helm_chart: daskhub
     helm_chart_values_files:
       - common.values.yaml
       - staging.values.yaml
       - enc-staging.secret.values.yaml
   - name: prod
     display_name: "Alabama Water Institute: CIROH (prod)"
-    domain: ciroh2.awi.2i2c.cloud
+    domain: ciroh.awi.2i2c.cloud
     helm_chart: daskhub
     helm_chart_values_files:
       - common.values.yaml

config/clusters/awi-ciroh-2/prod.values.yaml → config/clusters/awi-ciroh/prod.values.yaml

@@ -145,7 +145,6 @@ basehub:
               node.kubernetes.io/instance-type: n1-highmem-8
             extra_resource_limits:
               nvidia.com/gpu: "1"
-      # FIXME: Uncomment when buckets have been deployed
       extraEnv:
         SCRATCH_BUCKET: gs://awi-ciroh-scratch/$(JUPYTERHUB_USER)
         PANGEO_SCRATCH: gs://awi-ciroh-scratch/$(JUPYTERHUB_USER)

docs/helper-programs/generate-general-info-table-about-hubs.py

@@ -166,14 +166,6 @@ def main():
     df = pd.DataFrame(hub_list)
     community_hubs_by_cluster = build_hub_statistics_df(df)
 
-    # FIXME: This is a hack to accommodate the fact that we have two AWI-CIROH
-    #        clusters running identical hubs with identical names. Without these
-    #        two lines, the write_to_json_and_csv_files function will fail
-    #        complaining that the indexes are not unique. Remove these lines
-    #        once the old AWI-CIROH cluster has been decommissioned.
-    mask = df["cluster"] == "awi-ciroh-2"
-    df.loc[mask, "name"] = df["name"].astype(str) + " 2"
-
     df.set_index("name", inplace=True)
     write_to_json_and_csv_files(df, "hub-table")
     write_to_json_and_csv_files(community_hubs_by_cluster, "hub-stats")