Merge pull request #4774 from consideRatio/pr/update

deployer: update resource requests data etc for r7i machines
2i2c-org · Sep 10, 2024 · 5857bd8 · 5857bd8
2 parents 17020a0 + 7ccde9a
commit 5857bd8
Show file tree

Hide file tree

Showing 3 changed files with 117 additions and 56 deletions.
diff --git a/deployer/commands/generate/resource_allocation/daemonset_requests.yaml b/deployer/commands/generate/resource_allocation/daemonset_requests.yaml
@@ -40,7 +40,7 @@ gke:
   #
   2i2c:
     requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
-    other_daemon_sets: imagebuilding-demo-binderhub-service-docker-api
+    other_daemon_sets: docker-api,docker-api
     cpu_requests: 354m
     memory_requests: 656Mi
     k8s_version: v1.29.1-gke.1589020
@@ -49,65 +49,45 @@ gke:
     other_daemon_sets: ""
     cpu_requests: 354m
     memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
+    k8s_version: v1.29.1-gke.1589020
   awi-ciroh:
-    requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
+    requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
-    cpu_requests: 354m
-    memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
+    cpu_requests: 348m
+    memory_requests: 556Mi
+    k8s_version: v1.29.4-gke.1043002
   catalystproject-latam:
     # missing: gke-metrics-agent
     requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 348m
     memory_requests: 556Mi
-    k8s_version: v1.29.1-gke.1589018
+    k8s_version: v1.29.1-gke.1589020
   cloudbank:
     requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 354m
     memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
+    k8s_version: v1.29.1-gke.1589020
   hhmi:
     # missing: calico-node, ip-masq-agent, gke-metrics-agent
-    requesting_daemon_sets: fluentbit-gke,gke-metadata-server,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
+    requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
-    cpu_requests: 238m
-    memory_requests: 540Mi
-    k8s_version: v1.29.1-gke.1589020
+    cpu_requests: 348m
+    memory_requests: 556Mi
+    k8s_version: v1.29.6-gke.1254000
   leap:
     requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: maintenance-handler
     cpu_requests: 354m
     memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
-  linked-earth:
-    requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
-    other_daemon_sets: ""
-    cpu_requests: 354m
-    memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
-  meom-ige:
-    # missing: calico-node, ip-masq-agent
-    requesting_daemon_sets: fluentbit-gke,gke-metadata-server,gke-metrics-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
-    other_daemon_sets: ""
-    cpu_requests: 244m
-    memory_requests: 640Mi
-    k8s_version: v1.29.1-gke.1589018
+    k8s_version: v1.29.1-gke.1589020
   pangeo-hubs:
     requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,gke-metrics-agent,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 354m
     memory_requests: 656Mi
-    k8s_version: v1.29.1-gke.1589018
-  qcl:
-    # missing: gke-metrics-agent
-    requesting_daemon_sets: calico-node,fluentbit-gke,gke-metadata-server,ip-masq-agent,netd,pdcsi-node,support-cryptnono,support-prometheus-node-exporter
-    other_daemon_sets: ""
-    cpu_requests: 348m
-    memory_requests: 556Mi
-    k8s_version: v1.29.1-gke.1589018
+    k8s_version: v1.29.1-gke.1589020
 eks:
   # Current overhead is 195m and 250Mi (May 15 2024 with EKS 1.29.4).
   #
@@ -128,98 +108,116 @@ eks:
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   catalystproject-africa:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.3-eks-adc7111
+    k8s_version: v1.29.7-eks-2f46c53
   earthscope:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
-    cpu_requests: 170m
+    cpu_requests: 195m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   gridsst:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   jupyter-health:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 195m
     memory_requests: 250Mi
-    k8s_version: v1.29.3-eks-adc7111
+    k8s_version: v1.29.7-eks-2f46c53
   jupyter-meets-the-earth:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   kitware:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 195m
     memory_requests: 250Mi
-    k8s_version: v1.29.3-eks-adc7111
+    k8s_version: v1.29.7-eks-2f46c53
   nasa-cryo:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   nasa-esdis:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   nasa-ghg:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   nasa-veda:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
+  nmfs-openscapes:
+    requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
+    other_daemon_sets: ""
+    cpu_requests: 195m
+    memory_requests: 250Mi
+    k8s_version: v1.30.4-eks-a737599
   openscapes:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   opensci:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
-    other_daemon_sets: sciencecore-binderhub-service-docker-api
+    other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
+  projectpythia:
+    requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
+    other_daemon_sets: ""
+    cpu_requests: 195m
+    memory_requests: 250Mi
+    k8s_version: v1.29.7-eks-2f46c53
   smithsonian:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   ubc-eoas:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
   victor:
     requesting_daemon_sets: aws-node,ebs-csi-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: ""
     cpu_requests: 170m
     memory_requests: 250Mi
-    k8s_version: v1.29.4-eks-036c24b
+    k8s_version: v1.29.7-eks-2f46c53
 aks:
+  pchub:
+    requesting_daemon_sets: cloud-node-manager,csi-azuredisk-node,csi-azurefile-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
+    other_daemon_sets: calico-node
+    cpu_requests: 226m
+    memory_requests: 300Mi
+    k8s_version: v1.29.4
   utoronto:
     requesting_daemon_sets: cloud-node-manager,csi-azuredisk-node,csi-azurefile-node,kube-proxy,support-cryptnono,support-prometheus-node-exporter
     other_daemon_sets: calico-node

diff --git a/deployer/commands/generate/resource_allocation/instance_capacities.yaml b/deployer/commands/generate/resource_allocation/instance_capacities.yaml
@@ -21,16 +21,16 @@ n2-highmem-2:
   cpu_capacity_high: 2.0
   cpu_allocatable_low: 1.93
   cpu_allocatable_high: 1.93
-  mem_capacity_low: 15.631Gi
+  mem_capacity_low: 15.627Gi
   mem_capacity_high: 15.634Gi
-  mem_allocatable_low: 12.972Gi
+  mem_allocatable_low: 12.968Gi
   mem_allocatable_high: 12.975Gi
 n2-highmem-4:
   cpu_capacity_low: 4.0
   cpu_capacity_high: 4.0
   cpu_allocatable_low: 3.92
   cpu_allocatable_high: 3.92
-  mem_capacity_low: 31.354Gi
+  mem_capacity_low: 31.353Gi
   mem_capacity_high: 31.357Gi
   mem_allocatable_low: 27.734Gi
   mem_allocatable_high: 27.738Gi
@@ -131,7 +131,7 @@ r5.4xlarge:
   cpu_capacity_high: 16.0
   cpu_allocatable_low: 15.89
   cpu_allocatable_high: 15.89
-  mem_capacity_low: 124.353Gi
+  mem_capacity_low: 124.352Gi
   mem_capacity_high: 124.364Gi
   mem_allocatable_low: 121.492Gi
   mem_allocatable_high: 121.504Gi
@@ -144,6 +144,24 @@ r5.16xlarge:
   mem_capacity_high: 498.372Gi
   mem_allocatable_low: 490.108Gi
   mem_allocatable_high: 490.108Gi
+r7i.xlarge:
+  cpu_capacity_low: 4.0
+  cpu_capacity_high: 4.0
+  cpu_allocatable_low: 3.92
+  cpu_allocatable_high: 3.92
+  mem_capacity_low: 30.816Gi
+  mem_capacity_high: 30.816Gi
+  mem_allocatable_low: 29.847Gi
+  mem_allocatable_high: 29.847Gi
+r7i.4xlarge:
+  cpu_capacity_low: 16.0
+  cpu_capacity_high: 16.0
+  cpu_allocatable_low: 15.89
+  cpu_allocatable_high: 15.89
+  mem_capacity_low: 123.79Gi
+  mem_capacity_high: 123.79Gi
+  mem_allocatable_low: 120.93Gi
+  mem_allocatable_high: 120.93Gi
 m5.large:
   cpu_capacity_low: 2.0
   cpu_capacity_high: 2.0
@@ -182,6 +200,15 @@ g4dn.2xlarge:
   mem_allocatable_high: 30.227Gi
 
 # AKS instance types
+Standard_E2_v4:
+  cpu_capacity_low: 2.0
+  cpu_capacity_high: 2.0
+  cpu_allocatable_low: 1.9
+  cpu_allocatable_high: 1.9
+  mem_capacity_low: 15.616Gi
+  mem_capacity_high: 15.616Gi
+  mem_allocatable_low: 13.321Gi
+  mem_allocatable_high: 13.321Gi
 Standard_E4s_v3:
   cpu_capacity_low: 4.0
   cpu_capacity_high: 4.0

diff --git a/deployer/commands/generate/resource_allocation/node-capacity-info.json b/deployer/commands/generate/resource_allocation/node-capacity-info.json
@@ -53,6 +53,42 @@
             "memory": 525987313876
         }
     },
+    "r7i.xlarge": {
+        "capacity": {
+            "cpu": 4.0,
+            "memory": 33089273856
+        },
+        "allocatable": {
+            "cpu": 3.92,
+            "memory": 32048037888
+        },
+        "measured_overhead": {
+            "cpu": 0.195,
+            "memory": 262144000
+        },
+        "available": {
+            "cpu": 3.725,
+            "memory": 31859916406
+        }
+    },
+    "r7i.4xlarge": {
+        "capacity": {
+            "cpu": 16.0,
+            "memory": 132918992896
+        },
+        "allocatable": {
+            "cpu": 15.89,
+            "memory": 129847713792
+        },
+        "measured_overhead": {
+            "cpu": 0.195,
+            "memory": 262144000
+        },
+        "available": {
+            "cpu": 15.695,
+            "memory": 130188897681
+        }
+    },
     "n2-highmem-4": {
         "capacity": {
             "cpu": 4.0,