Remove extra basehub key

2i2c-org · Jan 9, 2025 · 630ac7f · 630ac7f
1 parent 396e67f
commit 630ac7f
Show file tree

Hide file tree

Showing 2 changed files with 182 additions and 184 deletions.
diff --git a/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml b/config/clusters/nmfs-openscapes/enc-workshop.secret.values.yaml
@@ -1,20 +1,19 @@
-basehub:
-  jupyterhub:
-    hub:
-      config:
-        DummyAuthenticator:
-          password: ENC[AES256_GCM,data:wRndqW/f9ibQ8JlW,iv:R3GYdbFi3gYmm97Wer1+2PFa0RPj7Drd3BbvBb7EJBc=,tag:wsmNKRgiulhoSiLVdiDMog==,type:str]
+jupyterhub:
+  hub:
+    config:
+      DummyAuthenticator:
+        password: ENC[AES256_GCM,data:3fSTbTvq8yXs2YET,iv:dU4LtV1RhpOZuUQaJHzqS8P1+HGD+R+cJ4oQ1tnpYXE=,tag:pAdFNCegRhiD0xf7Mry23A==,type:str]
 sops:
   kms: []
   gcp_kms:
     - resource_id: projects/two-eye-two-see/locations/global/keyRings/sops-keys/cryptoKeys/similar-hubs
-      created_at: "2025-01-09T12:40:41Z"
-      enc: CiUA4OM7eAKd+RcV3LRnoEhHM0DyRKyGzxh//EKw9uHxQAcwvFSmEkkAnGhyNl3nxpwmL4XMSu0LDVl8qbzcjwuGcihPtkGHhr6osKPjGSHlK15h+tcSaydkq3QFxZVx2GUiz/PtEi3z9R2CxdgkUabe
+      created_at: "2025-01-09T15:19:55Z"
+      enc: CiUA4OM7eGez8KDuQZXma3aE2ZS9b3HenoeE9zJDAt9k+DMfqFVMEkkAnGhyNvSoFbF+zxcX/4id6Slvrld7haauv8LWoKhnKNroAKcT7U9aEqy80YJrXAMKJeuaWBgcTZUtpulxNqhb5FltsbNX8eY1
   azure_kv: []
   hc_vault: []
   age: []
-  lastmodified: "2025-01-09T12:40:41Z"
-  mac: ENC[AES256_GCM,data:NDSImiTbDThtM7ztImZeH9j6BaQeQ8ncr/sAWaZqk1ZSXG1j5M43Rj48tDJx9/feQfF0RSLzAhM0F7ipIwUpbxLbP3uGP5Jl3I89fiCIAB6zJcuxyaIxn/bGZeYkWBzDF4//JOo9pU4AYwo+8FgDU3+eLg/GkGJEQRmN/yGCYM0=,iv:LlxcnhmtiksvMfIv22DT9pwwRTBuhm98jqOYB7x/3WA=,tag:KuIwj6il2TDxZKqk2cwIKw==,type:str]
+  lastmodified: "2025-01-09T15:19:56Z"
+  mac: ENC[AES256_GCM,data:09FmkRMmYDcnX4fJTVhCLkUqjDsYI11kX9iU5Ys8d839Dyk5Ff0KkXDWtQ3B7f98O+8dyarh4dxDMdwzB8NgacHfOgWpEQtofsPv3vW9hgKxOnBA1tNSYLoD3BNBQkJrQjx3gJ5sQE4W5PC6+lN4T0Dy66x/NF1A2lef7yrAODY=,iv:wozq2/LMLvr9gYCQO4BV0Z6urJL+c+HYKuRAKnRmMx8=,tag:Wglf2mmx/jO+JfT4fEb9Iw==,type:str]
   pgp: []
   unencrypted_suffix: _unencrypted
   version: 3.9.1
diff --git a/config/clusters/nmfs-openscapes/workshop.values.yaml b/config/clusters/nmfs-openscapes/workshop.values.yaml
@@ -1,174 +1,173 @@
-basehub:
-  jupyterhub:
-    custom:
-      2i2c:
-        add_staff_user_ids_to_admin_users: false
-      jupyterhubConfigurator:
-        enabled: false
-      homepage:
-        gitRepoBranch: "username-and-password-homepage"
-    ingress:
-      hosts: [workshop.nmfs-openscapes.2i2c.cloud]
-      tls:
-        - hosts: [workshop.nmfs-openscapes.2i2c.cloud]
-          secretName: https-auto-tls
-    hub:
-      allowNamedServers: true
-      config:
-        JupyterHub:
-          authenticator_class: dummy
-        Authenticator:
-          enable_auth_state: false
-          admin_users: []
-    singleuser:
-      defaultUrl: /lab
-      nodeSelector:
-        2i2c/hub-name: workshop
-      extraEnv:
-        SCRATCH_BUCKET: s3://nmfs-openscapes-scratch-workshop/$(JUPYTERHUB_USER)
-        PERSISTENT_BUCKET: s3://nmfs-openscapes-persistent-workshop/$(JUPYTERHUB_USER)
-    profileList:
-      - display_name: Default
-        description: Choose image and resource allocation
-        default: true
-        profile_options: &profile_options
-          image: &profile_options_image
-            display_name: Image
-            choices:
-              python:
-                display_name: Py - NASA Openscapes Python 39dffde
-                slug: python
-                kubespawner_override:
-                  image: openscapes/python:39dffde
-              pyrbase:
-                display_name: Py-R - base image 4.4-3.10
-                slug: pyrbase
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/py-rocket-base:latest
-              pyrgeo:
-                display_name: Py-R - Geospatial - py-rocket-geospatial latest
-                slug: pyrgeo
-                default: true
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/py-rocket-geospatial:latest
-              pyrgeo2:
-                display_name: Py-R - Geospatial + QGIS, Panoply, CWUtils - py-rocket-geospatial-2 latest
-                slug: pyrgeo2
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/py-rocket-geospatial-2:latest
-              coastwatch:
-                display_name: Py-R - CoastWatch - coastwatch latest
-                slug: coastwatch
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/coastwatch:latest
-              aomlomics:
-                display_name: Py - Tourmaline Snakemake workflow for QIIME 2 v.2023.5
-                slug: aomlomics
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/aomlomics-jh:latest
-              iorocker:
-                display_name: R - Geospatial w sdmTMB - r-geospatial-sdm latest
-                slug: rgeospatialsdm
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/r-geospatial-sdm:latest
-              echopype:
-                display_name: Py - Echopype with pangeo - image-acoustics latest
-                slug: echopype
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/image-acoustics:latest
-              arcgis:
-                display_name: Py - ArcGIS Python 3.9
-                slug: arcgis
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/arcgis:latest
-              cboettig:
-                display_name: Py-R - NASA TOPS - boettiger-lab nasa-tops latest
-                slug: cboettig
-                kubespawner_override:
-                  image: ghcr.io/boettiger-lab/nasa-tops:latest
-              vast:
-                display_name: R - VAST with TMB - vast latest
-                kubespawner_override:
-                  image: ghcr.io/nmfs-opensci/container-images/vast:latest
-              pace:
-                display_name: Py - PACE image with OCSSW tools
-                slug: pace
-                kubespawner_override:
-                  image: quay.io/pacehackweek/pace-2024:latest
-            unlisted_choice:
-              enabled: True
-              display_name: "Custom image"
-              validation_regex: "^.+:.+$"
-              validation_message: "Must be a publicly available docker image, of form <image-name>:<tag>"
-              kubespawner_override:
-                image: "{value}"
-          requests: &profile_options_resource_allocation
-            display_name: Resource Allocation
-            choices:
-              # choices generated by combining:
-              # - deployer generate resource-allocation choices r7i.xlarge
-              # - deployer generate resource-allocation choices r7i.4xlarge --num-allocations=2
-              mem_1_9:
-                display_name: 1.9 GB RAM, upto 3.7 CPUs
-                kubespawner_override:
-                  mem_guarantee: 1991244775
-                  mem_limit: 1991244775
-                  cpu_guarantee: 0.2328125
-                  cpu_limit: 3.725
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.xlarge
-                default: true
-              mem_3_7:
-                display_name: 3.7 GB RAM, upto 3.7 CPUs
-                kubespawner_override:
-                  mem_guarantee: 3982489550
-                  mem_limit: 3982489550
-                  cpu_guarantee: 0.465625
-                  cpu_limit: 3.725
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.xlarge
-              mem_7_4:
-                display_name: 7.4 GB RAM, upto 3.7 CPUs
-                kubespawner_override:
-                  mem_guarantee: 7964979101
-                  mem_limit: 7964979101
-                  cpu_guarantee: 0.93125
-                  cpu_limit: 3.725
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.xlarge
-              mem_14_8:
-                display_name: 14.8 GB RAM, upto 3.7 CPUs
-                kubespawner_override:
-                  mem_guarantee: 15929958203
-                  mem_limit: 15929958203
-                  cpu_guarantee: 1.8625
-                  cpu_limit: 3.725
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.xlarge
-              mem_29_7:
-                display_name: 29.7 GB RAM, upto 3.7 CPUs
-                kubespawner_override:
-                  mem_guarantee: 31859916406
-                  mem_limit: 31859916406
-                  cpu_guarantee: 3.725
-                  cpu_limit: 3.725
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.xlarge
-              mem_60_6:
-                display_name: 60.6 GB RAM, upto 15.6 CPUs
-                kubespawner_override:
-                  mem_guarantee: 65094448840
-                  mem_limit: 65094448840
-                  cpu_guarantee: 7.8475
-                  cpu_limit: 15.695
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.4xlarge
-              mem_121_2:
-                display_name: 121.2 GB RAM, upto 15.6 CPUs
-                kubespawner_override:
-                  mem_guarantee: 130188897681
-                  mem_limit: 130188897681
-                  cpu_guarantee: 15.695
-                  cpu_limit: 15.695
-                  node_selector:
-                    node.kubernetes.io/instance-type: r5.4xlarge
+jupyterhub:
+  custom:
+    2i2c:
+      add_staff_user_ids_to_admin_users: false
+    jupyterhubConfigurator:
+      enabled: false
+    homepage:
+      gitRepoBranch: "username-and-password-homepage"
+  ingress:
+    hosts: [workshop.nmfs-openscapes.2i2c.cloud]
+    tls:
+      - hosts: [workshop.nmfs-openscapes.2i2c.cloud]
+        secretName: https-auto-tls
+  hub:
+    allowNamedServers: true
+    config:
+      JupyterHub:
+        authenticator_class: dummy
+      Authenticator:
+        enable_auth_state: false
+        admin_users: []
+  singleuser:
+    defaultUrl: /lab
+    nodeSelector:
+      2i2c/hub-name: workshop
+    extraEnv:
+      SCRATCH_BUCKET: s3://nmfs-openscapes-scratch-workshop/$(JUPYTERHUB_USER)
+      PERSISTENT_BUCKET: s3://nmfs-openscapes-persistent-workshop/$(JUPYTERHUB_USER)
+  profileList:
+    - display_name: Default
+      description: Choose image and resource allocation
+      default: true
+      profile_options: &profile_options
+        image: &profile_options_image
+          display_name: Image
+          choices:
+            python:
+              display_name: Py - NASA Openscapes Python 39dffde
+              slug: python
+              kubespawner_override:
+                image: openscapes/python:39dffde
+            pyrbase:
+              display_name: Py-R - base image 4.4-3.10
+              slug: pyrbase
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/py-rocket-base:latest
+            pyrgeo:
+              display_name: Py-R - Geospatial - py-rocket-geospatial latest
+              slug: pyrgeo
+              default: true
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/py-rocket-geospatial:latest
+            pyrgeo2:
+              display_name: Py-R - Geospatial + QGIS, Panoply, CWUtils - py-rocket-geospatial-2 latest
+              slug: pyrgeo2
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/py-rocket-geospatial-2:latest
+            coastwatch:
+              display_name: Py-R - CoastWatch - coastwatch latest
+              slug: coastwatch
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/coastwatch:latest
+            aomlomics:
+              display_name: Py - Tourmaline Snakemake workflow for QIIME 2 v.2023.5
+              slug: aomlomics
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/aomlomics-jh:latest
+            iorocker:
+              display_name: R - Geospatial w sdmTMB - r-geospatial-sdm latest
+              slug: rgeospatialsdm
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/r-geospatial-sdm:latest
+            echopype:
+              display_name: Py - Echopype with pangeo - image-acoustics latest
+              slug: echopype
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/image-acoustics:latest
+            arcgis:
+              display_name: Py - ArcGIS Python 3.9
+              slug: arcgis
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/arcgis:latest
+            cboettig:
+              display_name: Py-R - NASA TOPS - boettiger-lab nasa-tops latest
+              slug: cboettig
+              kubespawner_override:
+                image: ghcr.io/boettiger-lab/nasa-tops:latest
+            vast:
+              display_name: R - VAST with TMB - vast latest
+              kubespawner_override:
+                image: ghcr.io/nmfs-opensci/container-images/vast:latest
+            pace:
+              display_name: Py - PACE image with OCSSW tools
+              slug: pace
+              kubespawner_override:
+                image: quay.io/pacehackweek/pace-2024:latest
+          unlisted_choice:
+            enabled: True
+            display_name: "Custom image"
+            validation_regex: "^.+:.+$"
+            validation_message: "Must be a publicly available docker image, of form <image-name>:<tag>"
+            kubespawner_override:
+              image: "{value}"
+        requests: &profile_options_resource_allocation
+          display_name: Resource Allocation
+          choices:
+            # choices generated by combining:
+            # - deployer generate resource-allocation choices r7i.xlarge
+            # - deployer generate resource-allocation choices r7i.4xlarge --num-allocations=2
+            mem_1_9:
+              display_name: 1.9 GB RAM, upto 3.7 CPUs
+              kubespawner_override:
+                mem_guarantee: 1991244775
+                mem_limit: 1991244775
+                cpu_guarantee: 0.2328125
+                cpu_limit: 3.725
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.xlarge
+              default: true
+            mem_3_7:
+              display_name: 3.7 GB RAM, upto 3.7 CPUs
+              kubespawner_override:
+                mem_guarantee: 3982489550
+                mem_limit: 3982489550
+                cpu_guarantee: 0.465625
+                cpu_limit: 3.725
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.xlarge
+            mem_7_4:
+              display_name: 7.4 GB RAM, upto 3.7 CPUs
+              kubespawner_override:
+                mem_guarantee: 7964979101
+                mem_limit: 7964979101
+                cpu_guarantee: 0.93125
+                cpu_limit: 3.725
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.xlarge
+            mem_14_8:
+              display_name: 14.8 GB RAM, upto 3.7 CPUs
+              kubespawner_override:
+                mem_guarantee: 15929958203
+                mem_limit: 15929958203
+                cpu_guarantee: 1.8625
+                cpu_limit: 3.725
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.xlarge
+            mem_29_7:
+              display_name: 29.7 GB RAM, upto 3.7 CPUs
+              kubespawner_override:
+                mem_guarantee: 31859916406
+                mem_limit: 31859916406
+                cpu_guarantee: 3.725
+                cpu_limit: 3.725
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.xlarge
+            mem_60_6:
+              display_name: 60.6 GB RAM, upto 15.6 CPUs
+              kubespawner_override:
+                mem_guarantee: 65094448840
+                mem_limit: 65094448840
+                cpu_guarantee: 7.8475
+                cpu_limit: 15.695
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.4xlarge
+            mem_121_2:
+              display_name: 121.2 GB RAM, upto 15.6 CPUs
+              kubespawner_override:
+                mem_guarantee: 130188897681
+                mem_limit: 130188897681
+                cpu_guarantee: 15.695
+                cpu_limit: 15.695
+                node_selector:
+                  node.kubernetes.io/instance-type: r5.4xlarge