Merge remote-tracking branch 'upstream/main' into jhealth

config/clusters/2i2c-aws-us/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: 2i2c-aws-us
   region: us-west-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/bican/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: bican
   region: us-east-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/catalystproject-africa/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: catalystproject-africa
   region: af-south-1
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/earthscope/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: earthscope
   region: us-east-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/gridsst/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: gridsst
   region: us-west-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/jupyter-meets-the-earth/cluster.yaml

@@ -1,10 +1,12 @@
 name: jupyter-meets-the-earth
-provider: aws #  https://286354552638.signin.aws.amazon.com/console
+provider: aws # https://286354552638.signin.aws.amazon.com/console
 aws:
   key: enc-deployer-credentials.secret.json
   clusterType: eks
   clusterName: jupyter-meets-the-earth
   region: us-west-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/leap/cluster.yaml

@@ -6,7 +6,7 @@ gcp:
   cluster: leap-cluster
   zone: us-central1
   billing:
-    paid_by_us: true
+    paid_by_us: false
     bigquery:
       project: leap-pangeo
       dataset: cloud_costs

config/clusters/linc/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: linc
   region: us-east-1
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/nasa-cryo/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: nasa-cryo
   region: us-west-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/nasa-esdis/cluster.yaml

@@ -6,6 +6,8 @@ aws:
   clusterType: eks
   clusterName: nasa-esdis
   region: us-west-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/nasa-ghg/cluster.yaml

@@ -6,6 +6,8 @@ aws:
   clusterType: eks
   clusterName: nasa-ghg-hub
   region: us-west-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/nasa-veda/cluster.yaml

@@ -6,6 +6,8 @@ aws:
   clusterType: eks
   clusterName: nasa-veda
   region: us-west-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/openscapes/cluster.yaml

@@ -6,6 +6,8 @@ aws:
   clusterType: eks
   clusterName: openscapeshub
   region: us-west-2
+  billing:
+    paid_by_us: false
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/opensci/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: opensci
   region: us-west-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/pangeo-hubs/support.values.yaml

@@ -35,6 +35,6 @@ prometheus:
             - prometheus.gcp.pangeo.2i2c.cloud
     resources:
       requests:
-        memory: 16Gi
+        memory: 24Gi
       limits:
-        memory: 16Gi
+        memory: 24Gi

config/clusters/smithsonian/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: smithsonian
   region: us-east-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/templates/gcp/cluster.yaml

@@ -1,5 +1,5 @@
 name: {{ cluster_name }}
-provider: gcp
+provider: gcp # https://console.cloud.google.com/kubernetes/clusters/details/{{ cluster_region }}/{{ cluster_name }}-cluster/observability?project={{ project_id }}
 gcp:
   key: enc-deployer-credentials.secret.json
   project: {{ project_id }}

config/clusters/ubc-eoas/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: ubc-eoas
   region: ca-central-1
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

config/clusters/victor/cluster.yaml

@@ -5,6 +5,8 @@ aws:
   clusterType: eks
   clusterName: victor
   region: us-west-2
+  billing:
+    paid_by_us: true
 support:
   helm_chart_values_files:
     - support.values.yaml

deployer/commands/validate/cluster.schema.yaml

@@ -66,10 +66,18 @@ properties:
     description: |
       Configuration to connect to the cluster on GCP. Is used when
       provider is set to `gcp`
+    required:
+      - key
+      - project
+      - cluster
+      - zone
+      - billing
     properties:
       billing:
         type: object
         additionalProperties: false
+        required:
+          - paid_by_us
         # if paid_by_us is true, we *must* provide bigquery information
         # on where to find the costs export for this project
         if:
@@ -79,15 +87,13 @@ properties:
         then:
           required:
             - bigquery
-        required:
-          - paid_by_us
         description: |
           Billing information for this cluster
         properties:
           paid_by_us:
             type: boolean
             description: |
-              Set to true if the cloud cost is paid by us, and expected to be
+              Set to true if the cloud cost is paid by 2i2c, and expected to be
               recovered from actual users.
           bigquery:
             type: object
@@ -133,15 +139,15 @@ properties:
           If the cluster is a zonal cluster, this specifies the zone
           in which the cluster is. If it's a regional cluster, this
           specifies the region the cluster is in.
-    required:
-      - key
-      - project
-      - cluster
-      - zone
-      - billing
   aws:
     type: object
     additionalProperties: false
+    required:
+      - key
+      - clusterType
+      - clusterName
+      - region
+      - billing
     description: |
       Configuration to connect to the cluster on AWS.
       Is used when provider is set to `aws`.
@@ -168,14 +174,24 @@ properties:
         type: string
         description: |
           The AWS region the cluster is in.
-    required:
-      - key
-      - clusterType
-      - clusterName
-      - region
+      billing:
+        type: object
+        additionalProperties: false
+        required:
+          - paid_by_us
+        properties:
+          paid_by_us:
+            type: boolean
+            description: |
+              Set to true if the cloud cost is paid by 2i2c, and expected to be
+              recovered from actual users.
   azure:
     type: object
     additionalProperties: false
+    required:
+      - key
+      - resource_group
+      - cluster
     description: |
       Configuration to connect to a cluster on Azure. Is used when
       provider is set to `azure`
@@ -197,10 +213,6 @@ properties:
         type: string
         description: |
           Name of the cluster inside this Azure Resource Group
-    required:
-      - key
-      - resource_group
-      - cluster
   hubs:
     type: array
     description: |

docs/hub-deployment-guide/new-cluster/aws.md

@@ -250,7 +250,7 @@ have least amount of permissions possible.
 
    ```yaml
    name: <your-cluster-name>
-   provider: aws
+   provider: aws # <copy paste link to sign in url here>
    aws:
      key: enc-deployer-credentials.secret.json
      clusterType: eks