From 66912dc130953da7d43ddd1583b846854248b6ce Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 May 2024 15:07:30 -0600
Subject: [PATCH 1/5] add range
---
nshms.yml | 105 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 90 insertions(+), 15 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index e8d2c2c2..f6149a29 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -11,11 +11,26 @@ nshms:
baseHref: /ws/nshmp/alaska-2007/dynamic
environments:
development:
- instanceType: c7g.large
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 4
+ max: 8
staging:
- instanceType: c7g.large
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 4
+ max: 8
# production:
- # instanceType: c7g.large
+ # cpu:
+ # min: 2
+ # max: 4
+ # memory:
+ # min: 4
+ # max: 8
label: 2007 Alaska Dynamic Services
model: ALASKA_2007
test:
@@ -33,11 +48,26 @@ nshms:
baseHref: /ws/nshmp/alaska-2023/dynamic
environments:
development:
- instanceType: r7g.xlarge
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 16
+ max: 32
staging:
- instanceType: c7g.4xlarge
+ cpu:
+ min: 8
+ max: 16
+ memory:
+ min: 16
+ max: 32
production:
- instanceType: c7g.4xlarge
+ cpu:
+ min: 8
+ max: 16
+ memory:
+ min: 16
+ max: 32
label: 2023 Alaska Dynamic Services (beta)
model: ALASKA_2023
test:
@@ -55,11 +85,26 @@ nshms:
baseHref: /ws/nshmp/conus-2018/dynamic
environments:
development:
- instanceType: r7g.xlarge
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 16
+ max: 32
staging:
- instanceType: c7g.2xlarge
+ cpu:
+ min: 8
+ max: 16
+ memory:
+ min: 16
+ max: 32
production:
- instanceType: c7g.4xlarge
+ cpu:
+ min: 16
+ max: 32
+ memory:
+ min: 16
+ max: 64
label: 2018 Conterminous U.S. Dynamic Services
model: CONUS_2018
test:
@@ -77,11 +122,26 @@ nshms:
baseHref: /ws/nshmp/conus-2023/dynamic
environments:
development:
- instanceType: r7g.xlarge
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 16
+ max: 32
staging:
- instanceType: c7g.2xlarge
+ cpu:
+ min: 8
+ max: 16
+ memory:
+ min: 16
+ max: 32
production:
- instanceType: c7g.4xlarge
+ cpu:
+ min: 16
+ max: 32
+ memory:
+ min: 16
+ max: 64
label: 2023 Conterminous U.S. Dynamic Services (beta)
model: CONUS_2023
test:
@@ -99,11 +159,26 @@ nshms:
baseHref: /ws/nshmp/hawaii-2021/dynamic
environments:
development:
- instanceType: c7g.large
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 4
+ max: 8
staging:
- instanceType: c7g.xlarge
+ cpu:
+ min: 2
+ max: 4
+ memory:
+ min: 4
+ max: 8
production:
- instanceType: c7g.2xlarge
+ cpu:
+ min: 8
+ max: 16
+ memory:
+ min: 8
+ max: 16
label: 2021 Hawaii Dynamic Services
model: HAWAII_2021
test:
--
GitLab
From eeab0df6c1173d58b3dec5e0d72b6d7ba75332af Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 May 2024 17:39:12 -0600
Subject: [PATCH 2/5] up memory
---
nshms.yml | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index f6149a29..e1841d34 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -52,22 +52,22 @@ nshms:
min: 2
max: 4
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
staging:
cpu:
min: 8
max: 16
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
production:
cpu:
min: 8
max: 16
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
label: 2023 Alaska Dynamic Services (beta)
model: ALASKA_2023
test:
--
GitLab
From 5ee45823c2e8c912b42c88b90c810c33dd09397f Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Mon, 6 May 2024 18:24:28 -0600
Subject: [PATCH 3/5] up resources
---
nshms.yml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index e1841d34..6b10513a 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -89,21 +89,21 @@ nshms:
min: 2
max: 4
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
staging:
cpu:
min: 8
max: 16
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
production:
cpu:
min: 16
max: 32
memory:
- min: 16
+ min: 32
max: 64
label: 2018 Conterminous U.S. Dynamic Services
model: CONUS_2018
@@ -126,21 +126,21 @@ nshms:
min: 2
max: 4
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
staging:
cpu:
min: 8
max: 16
memory:
- min: 16
- max: 32
+ min: 32
+ max: 64
production:
cpu:
min: 16
max: 32
memory:
- min: 16
+ min: 32
max: 64
label: 2023 Conterminous U.S. Dynamic Services (beta)
model: CONUS_2023
--
GitLab
From aca34a9b396765fc549872a8af14e4db09ce2526 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 8 May 2024 10:44:33 -0600
Subject: [PATCH 4/5] switch to min values only
---
nshms.yml | 120 ++++++++++++++----------------------------------------
1 file changed, 30 insertions(+), 90 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 6b10513a..090e2f11 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -11,26 +11,14 @@ nshms:
baseHref: /ws/nshmp/alaska-2007/dynamic
environments:
development:
- cpu:
- min: 2
- max: 4
- memory:
- min: 4
- max: 8
+ cpu: 2
+ memory: 4
staging:
- cpu:
- min: 2
- max: 4
- memory:
- min: 4
- max: 8
+ cpu: 2
+ memory: 4
# production:
- # cpu:
- # min: 2
- # max: 4
- # memory:
- # min: 4
- # max: 8
+ # cpu: 2
+ # memory: 4
label: 2007 Alaska Dynamic Services
model: ALASKA_2007
test:
@@ -48,26 +36,14 @@ nshms:
baseHref: /ws/nshmp/alaska-2023/dynamic
environments:
development:
- cpu:
- min: 2
- max: 4
- memory:
- min: 32
- max: 64
+ cpu: 2
+ memory: 32
staging:
- cpu:
- min: 8
- max: 16
- memory:
- min: 32
- max: 64
+ cpu: 8
+ memory: 32
production:
- cpu:
- min: 8
- max: 16
- memory:
- min: 32
- max: 64
+ cpu: 8
+ memory: 32
label: 2023 Alaska Dynamic Services (beta)
model: ALASKA_2023
test:
@@ -85,26 +61,14 @@ nshms:
baseHref: /ws/nshmp/conus-2018/dynamic
environments:
development:
- cpu:
- min: 2
- max: 4
- memory:
- min: 32
- max: 64
+ cpu: 2
+ memory: 32
staging:
- cpu:
- min: 8
- max: 16
- memory:
- min: 32
- max: 64
+ cpu: 8
+ memory: 32
production:
- cpu:
- min: 16
- max: 32
- memory:
- min: 32
- max: 64
+ cpu: 16
+ memory: 32
label: 2018 Conterminous U.S. Dynamic Services
model: CONUS_2018
test:
@@ -122,26 +86,14 @@ nshms:
baseHref: /ws/nshmp/conus-2023/dynamic
environments:
development:
- cpu:
- min: 2
- max: 4
- memory:
- min: 32
- max: 64
+ cpu: 2
+ memory: 32
staging:
- cpu:
- min: 8
- max: 16
- memory:
- min: 32
- max: 64
+ cpu: 8
+ memory: 32
production:
- cpu:
- min: 16
- max: 32
- memory:
- min: 32
- max: 64
+ cpu: 16
+ memory: 32
label: 2023 Conterminous U.S. Dynamic Services (beta)
model: CONUS_2023
test:
@@ -159,26 +111,14 @@ nshms:
baseHref: /ws/nshmp/hawaii-2021/dynamic
environments:
development:
- cpu:
- min: 2
- max: 4
- memory:
- min: 4
- max: 8
+ cpu: 2
+ memory: 4
staging:
- cpu:
- min: 2
- max: 4
- memory:
- min: 4
- max: 8
+ cpu: 2
+ memory: 4
production:
- cpu:
- min: 8
- max: 16
- memory:
- min: 8
- max: 16
+ cpu: 8
+ memory: 8
label: 2021 Hawaii Dynamic Services
model: HAWAII_2021
test:
--
GitLab
From 3b46e11ad00218906cbc9dff909a7540afb67e22 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 8 May 2024 11:54:07 -0600
Subject: [PATCH 5/5] change cpu
---
nshms.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/nshms.yml b/nshms.yml
index 090e2f11..6ae1185a 100644
--- a/nshms.yml
+++ b/nshms.yml
@@ -36,7 +36,7 @@ nshms:
baseHref: /ws/nshmp/alaska-2023/dynamic
environments:
development:
- cpu: 2
+ cpu: 4
memory: 32
staging:
cpu: 8
@@ -61,7 +61,7 @@ nshms:
baseHref: /ws/nshmp/conus-2018/dynamic
environments:
development:
- cpu: 2
+ cpu: 4
memory: 32
staging:
cpu: 8
@@ -86,7 +86,7 @@ nshms:
baseHref: /ws/nshmp/conus-2023/dynamic
environments:
development:
- cpu: 2
+ cpu: 4
memory: 32
staging:
cpu: 8
@@ -114,7 +114,7 @@ nshms:
cpu: 2
memory: 4
staging:
- cpu: 2
+ cpu: 4
memory: 4
production:
cpu: 8
--
GitLab