From 4d28523ca7a49fe9121cd3feec0d4171af319a9b Mon Sep 17 00:00:00 2001 From: Vismayak Mohanarajan Date: Mon, 8 Apr 2024 09:51:07 -0500 Subject: [PATCH 1/6] Updating Joplin RS Builder Labels (#123) * Updating Joplin RS Builder Labels * Update Chart.yaml * Update Chart.yaml --- Chart.yaml | 2 +- README.md | 4 ++++ playbook-configs/joplin/globals.config.dev.json | 10 +++++----- playbook-configs/joplin/globals.config.prod.json | 10 +++++----- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index eaf1c33..7acedd4 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -47,6 +47,6 @@ annotations: - name: Helm Chart url: https://github.com/IN-CORE/incore-helm artifacthub.io/changes: | - - Update Galveston configuration CPU number to acheive best performance + - Update labels for Joplin Retrofit Strategy Builder diff --git a/README.md b/README.md index 8600837..d03a020 100644 --- a/README.md +++ b/README.md @@ -103,6 +103,10 @@ IN-CORE will use a persistent storage to store all data that is uploaded as well For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc.yaml). ## ChangeLog + +### [Unreleased] +- Update labels for Joplin Retrofit Strategy Builder [#450](https://github.com/IN-CORE/incore-playbook/issues/450) + ### 1.25.3 - Update Galveston configuration CPU number to acheive best performance diff --git a/playbook-configs/joplin/globals.config.dev.json b/playbook-configs/joplin/globals.config.dev.json index c582604..e4890cd 100644 --- a/playbook-configs/joplin/globals.config.dev.json +++ b/playbook-configs/joplin/globals.config.dev.json @@ -125,11 +125,11 @@ "key": "strtypes", "possibleOptions": [ { - "label": "1 story residential wood building (small rectangular plan and gable roof)", + "label": "1-story wood-frame residential buildings", "value": "1" }, { - "label": "2 stories residential wood building (large rectangular plan and gable roof)", + "label": "2-story wood-frame residential buildings", "value": "5" } ] @@ -148,21 +148,21 @@ "key": "retrofits", "possibleOptions": [ { - "label": "Current Practice - Asphalt Shingles, 8d Sheath, 2x16d R-W", + "label": "Joplin buildings constructed following the 2006 IRC", "value": { "ret_key": "retrofit_1", "ret_val": "" } }, { - "label": "Asphalt Shingles, 8d Sheath C6/6, 2xH2.5 R-W Clips", + "label": "Joplin buildings with a cost-effective retrofit plan", "value": { "ret_key": "retrofit_2", "ret_val": "" } }, { - "label": "Clay Tiles, 8d Sheath C6/6, 2xH2.5 R-W Clips", + "label": "Joplin buildings with a high-performance retrofit plan", "value": { "ret_key": "retrofit_3", "ret_val": "" diff --git a/playbook-configs/joplin/globals.config.prod.json b/playbook-configs/joplin/globals.config.prod.json index eb80f3b..d691e16 100644 --- a/playbook-configs/joplin/globals.config.prod.json +++ b/playbook-configs/joplin/globals.config.prod.json @@ -125,11 +125,11 @@ "key": "strtypes", "possibleOptions": [ { - "label": "1 story residential wood building (small rectangular plan and gable roof)", + "label": "1-story wood-frame residential buildings", "value": "1" }, { - "label": "2 stories residential wood building (large rectangular plan and gable roof)", + "label": "2-story wood-frame residential buildings", "value": "5" } ] @@ -148,21 +148,21 @@ "key": "retrofits", "possibleOptions": [ { - "label": "Current Practice - Asphalt Shingles, 8d Sheath, 2x16d R-W", + "label": "Joplin buildings constructed following the 2006 IRC", "value": { "ret_key": "retrofit_1", "ret_val": "" } }, { - "label": "Asphalt Shingles, 8d Sheath C6/6, 2xH2.5 R-W Clips", + "label": "Joplin buildings with a cost-effective retrofit plan", "value": { "ret_key": "retrofit_2", "ret_val": "" } }, { - "label": "Clay Tiles, 8d Sheath C6/6, 2xH2.5 R-W Clips", + "label": "Joplin buildings with a high-performance retrofit plan", "value": { "ret_key": "retrofit_3", "ret_val": "" From 10aae6c5327e9a68c5b6657db285362fa3df579a Mon Sep 17 00:00:00 2001 From: Rashmil Panchani <32737711+Rashmil-1999@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:27:43 +0530 Subject: [PATCH 2/6] update slc regions and remove additional sector (#113) * update slc regions and remove additional sector * add readme entry * update charts --------- Co-authored-by: Chen Wang --- Chart.yaml | 1 + README.md | 1 + playbook-configs/slc/cgeInfo.json | 6 ++---- .../slc/datawolfWorkflow.config.dev.json | 4 ++-- .../slc/datawolfWorkflow.config.prod.json | 4 ++-- playbook-configs/slc/globals.config.dev.json | 20 +++++++++++++++++++ playbook-configs/slc/globals.config.prod.json | 20 +++++++++++++++++++ 7 files changed, 48 insertions(+), 8 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 7acedd4..cf9c3e0 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -47,6 +47,7 @@ annotations: - name: Helm Chart url: https://github.com/IN-CORE/incore-helm artifacthub.io/changes: | + - Update SLC regions and add new regions for Playbook Config - Update labels for Joplin Retrofit Strategy Builder diff --git a/README.md b/README.md index d03a020..e49c39e 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc. ## ChangeLog ### [Unreleased] +- Update slc regions and remove additional sector [#388](https://github.com/IN-CORE/incore-playbook/issues/388) - Update labels for Joplin Retrofit Strategy Builder [#450](https://github.com/IN-CORE/incore-playbook/issues/450) ### 1.25.3 diff --git a/playbook-configs/slc/cgeInfo.json b/playbook-configs/slc/cgeInfo.json index a898e79..b7417a4 100644 --- a/playbook-configs/slc/cgeInfo.json +++ b/playbook-configs/slc/cgeInfo.json @@ -25,8 +25,7 @@ "ART_ACC": "Arts, Entertainment, Recreation, Accommodation and Food Services", "RELIG": "Religious Organizations", "HS1": "Lower-value homes (less than $100k)", - "HS2": "Middle-value homes (100k-200k)", - "HS3": "Higher - value homes (more than 200k)" + "HS2": "Middle-value homes (100k-200k)" } }, "employment": { @@ -44,8 +43,7 @@ "ART_ACC": "Arts, Entertainment, Recreation, Accommodation and Food Services", "RELIG": "Religious Organizations", "HS1": "Lower-value homes (less than $100k)", - "HS2": "Middle-value homes (100k-200k)", - "HS3": "Higher - value homes (more than 200k)" + "HS2": "Middle-value homes (100k-200k)" } } } diff --git a/playbook-configs/slc/datawolfWorkflow.config.dev.json b/playbook-configs/slc/datawolfWorkflow.config.dev.json index f1a733b..3522033 100644 --- a/playbook-configs/slc/datawolfWorkflow.config.dev.json +++ b/playbook-configs/slc/datawolfWorkflow.config.dev.json @@ -915,7 +915,7 @@ "variableName": "regions", "widget": null, "hidden": true, - "defaultValue": "R1,R2", + "defaultValue": "R1,R2,R3,R4,R5,R6,R7", "parametersMap": [ { "paramId": "46509d68-7f9e-447f-eb76-de5a884cf3b0", @@ -966,7 +966,7 @@ "variableName": "supCategories", "widget": null, "hidden": true, - "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2,HS3", + "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2", "parametersMap": [ { "paramId": "7c88cdbf-3801-4371-e709-50be083c7f75", diff --git a/playbook-configs/slc/datawolfWorkflow.config.prod.json b/playbook-configs/slc/datawolfWorkflow.config.prod.json index f075455..950b8da 100644 --- a/playbook-configs/slc/datawolfWorkflow.config.prod.json +++ b/playbook-configs/slc/datawolfWorkflow.config.prod.json @@ -915,7 +915,7 @@ "variableName": "regions", "widget": null, "hidden": true, - "defaultValue": "R1,R2", + "defaultValue": "R1,R2,R3,R4,R5,R6,R7", "parametersMap": [ { "paramId": "46509d68-7f9e-447f-eb76-de5a884cf3b0", @@ -966,7 +966,7 @@ "variableName": "supCategories", "widget": null, "hidden": true, - "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2,HS3", + "defaultValue": "AG_MI,UTIL,CONS,MANU,COMMER,EDU,HEALTH,ART_ACC,RELIG,HS1,HS2", "parametersMap": [ { "paramId": "7c88cdbf-3801-4371-e709-50be083c7f75", diff --git a/playbook-configs/slc/globals.config.dev.json b/playbook-configs/slc/globals.config.dev.json index bad739f..c01dc41 100644 --- a/playbook-configs/slc/globals.config.dev.json +++ b/playbook-configs/slc/globals.config.dev.json @@ -18,6 +18,26 @@ { "name": "R2", "value": "R2" + }, + { + "name": "R3", + "value": "R3" + }, + { + "name": "R4", + "value": "R4" + }, + { + "name": "R5", + "value": "R5" + }, + { + "name": "R6", + "value": "R6" + }, + { + "name": "R7", + "value": "R7" } ], "testbedSpace": "commresilienceslc", diff --git a/playbook-configs/slc/globals.config.prod.json b/playbook-configs/slc/globals.config.prod.json index 884682e..79886b4 100644 --- a/playbook-configs/slc/globals.config.prod.json +++ b/playbook-configs/slc/globals.config.prod.json @@ -18,6 +18,26 @@ { "name": "R2", "value": "R2" + }, + { + "name": "R3", + "value": "R3" + }, + { + "name": "R4", + "value": "R4" + }, + { + "name": "R5", + "value": "R5" + }, + { + "name": "R6", + "value": "R6" + }, + { + "name": "R7", + "value": "R7" } ], "testbedSpace": "slc-app", From 753ff32fd5d2691be1bb367bf74842613408f508 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 8 Apr 2024 11:36:05 -0500 Subject: [PATCH 3/6] 122 shorten the slc retrofit key (#124) * update configs * config slc * shorten retrofit method keys too --- Chart.yaml | 5 +-- README.md | 1 + playbook-configs/slc/globals.config.dev.json | 43 +++++++++++++++++-- playbook-configs/slc/globals.config.prod.json | 43 +++++++++++++++++-- 4 files changed, 83 insertions(+), 9 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index cf9c3e0..424fcd0 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -47,7 +47,6 @@ annotations: - name: Helm Chart url: https://github.com/IN-CORE/incore-helm artifacthub.io/changes: | + - Update configuration for SLC Retrofit Strategy Builder - Update SLC regions and add new regions for Playbook Config - - Update labels for Joplin Retrofit Strategy Builder - - + - Update labels for Joplin Retrofit Strategy Builder diff --git a/README.md b/README.md index e49c39e..a5ed8c1 100644 --- a/README.md +++ b/README.md @@ -105,6 +105,7 @@ For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc. ## ChangeLog ### [Unreleased] +- Update configuration for SLC Retrofit Strategy Builder [#122](https://github.com/IN-CORE/incore-helm/issues/122) - Update slc regions and remove additional sector [#388](https://github.com/IN-CORE/incore-playbook/issues/388) - Update labels for Joplin Retrofit Strategy Builder [#450](https://github.com/IN-CORE/incore-playbook/issues/450) diff --git a/playbook-configs/slc/globals.config.dev.json b/playbook-configs/slc/globals.config.dev.json index c01dc41..0cfe3ee 100644 --- a/playbook-configs/slc/globals.config.dev.json +++ b/playbook-configs/slc/globals.config.dev.json @@ -152,7 +152,44 @@ "label": "City Council District", "type": "mapSelect", "key": "zones", - "possibleOptions": [] + "possibleOptions": [ + { + "label": "District 1", + "value": "1" + }, + { + "label": "District 2", + "value": "2" + }, + { + "label": "District 3", + "value": "3" + }, + { + "label": "District 4", + "value": "4" + }, + { + "label": "District 5", + "value": "5" + }, + { + "label": "District 6", + "value": "6" + }, + { + "label": "District 7", + "value": "7" + }, + { + "label": "District 8", + "value": "8" + }, + { + "label": "District 9", + "value": "9" + } + ] }, { "label": "Building Structural Type", @@ -185,7 +222,7 @@ { "label": "Wood or Metal Deck Diaphragms", "value": { - "ret_key": "Wood or Metal Deck Diaphragms", + "ret_key": "WMDD", "ret_val": "" } } @@ -194,7 +231,7 @@ ], "zoneLayerId": "65f509b6e42f3b0da55d74cf", "activeLayerNames": "Zone", - "activeLayerFieldname": "NAME", + "activeLayerFieldname": "COUNCIL_ID", "zoneMapBounds": [ -112.10137778755622, 40.69990503292076, diff --git a/playbook-configs/slc/globals.config.prod.json b/playbook-configs/slc/globals.config.prod.json index 79886b4..bd42d42 100644 --- a/playbook-configs/slc/globals.config.prod.json +++ b/playbook-configs/slc/globals.config.prod.json @@ -152,7 +152,44 @@ "label": "City Council District", "type": "mapSelect", "key": "zones", - "possibleOptions": [] + "possibleOptions": [ + { + "label": "District 1", + "value": "1" + }, + { + "label": "District 2", + "value": "2" + }, + { + "label": "District 3", + "value": "3" + }, + { + "label": "District 4", + "value": "4" + }, + { + "label": "District 5", + "value": "5" + }, + { + "label": "District 6", + "value": "6" + }, + { + "label": "District 7", + "value": "7" + }, + { + "label": "District 8", + "value": "8" + }, + { + "label": "District 9", + "value": "9" + } + ] }, { "label": "Building Structural Type", @@ -185,7 +222,7 @@ { "label": "Wood or Metal Deck Diaphragms", "value": { - "ret_key": "Wood or Metal Deck Diaphragms", + "ret_key": "WMDD", "ret_val": "" } } @@ -194,7 +231,7 @@ ], "zoneLayerId": "65f50c2b36b03d433855ae81", "activeLayerNames": "Zone", - "activeLayerFieldname": "NAME", + "activeLayerFieldname": "COUNCIL_ID", "zoneMapBounds": [ -112.10137778755622, 40.69990503292076, From a5641fbcadbacf2ee5048079a5085d6ab7ee845a Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 8 Apr 2024 11:43:02 -0500 Subject: [PATCH 4/6] bump version ups --- Chart.yaml | 2 +- README.md | 8 ++++---- values.yaml | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 424fcd0..83e1499 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -8,7 +8,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 1.25.3 +version: 1.26.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to diff --git a/README.md b/README.md index a5ed8c1..6df7891 100644 --- a/README.md +++ b/README.md @@ -104,10 +104,10 @@ For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc. ## ChangeLog -### [Unreleased] -- Update configuration for SLC Retrofit Strategy Builder [#122](https://github.com/IN-CORE/incore-helm/issues/122) -- Update slc regions and remove additional sector [#388](https://github.com/IN-CORE/incore-playbook/issues/388) -- Update labels for Joplin Retrofit Strategy Builder [#450](https://github.com/IN-CORE/incore-playbook/issues/450) +### 1.26.0 +- Update configuration for SLC Retrofit Strategy Builder +- Update slc regions and remove additional sector +- Update labels for Joplin Retrofit Strategy Builder ### 1.25.3 - Update Galveston configuration CPU number to acheive best performance diff --git a/values.yaml b/values.yaml index 6461bdd..a12345f 100644 --- a/values.yaml +++ b/values.yaml @@ -416,19 +416,19 @@ playbooks: enabled: true image: repository: playbook/slc - tag: 0.3.0 + tag: 0.3.1 replicas: 1 joplin: enabled: true image: repository: playbook/joplin - tag: 0.2.0 + tag: 0.2.1 replicas: 1 galveston: enabled: true image: repository: playbook/galveston - tag: 0.2.0 + tag: 0.2.1 replicas: 1 # ---------------------------------------------------------------------- @@ -437,7 +437,7 @@ playbooks: datawolf: image: repository: hub.ncsa.illinois.edu/incore/datawolf - tag: 1.12.0 + tag: 1.13.0 auth: enabled: false From 095af8f1b61e703cca016bc811e1b3e6974dfbbb Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 8 Apr 2024 15:51:05 -0500 Subject: [PATCH 5/6] change slc max strategy to 18 --- playbook-configs/slc/globals.config.dev.json | 2 +- playbook-configs/slc/globals.config.prod.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/playbook-configs/slc/globals.config.dev.json b/playbook-configs/slc/globals.config.dev.json index 0cfe3ee..9065056 100644 --- a/playbook-configs/slc/globals.config.dev.json +++ b/playbook-configs/slc/globals.config.dev.json @@ -146,7 +146,7 @@ "#CDECF0", "#FFE3C4" ], - "maxStrategies": 5, + "maxStrategies": 18, "conditions": [ { "label": "City Council District", diff --git a/playbook-configs/slc/globals.config.prod.json b/playbook-configs/slc/globals.config.prod.json index bd42d42..3a6f712 100644 --- a/playbook-configs/slc/globals.config.prod.json +++ b/playbook-configs/slc/globals.config.prod.json @@ -146,7 +146,7 @@ "#CDECF0", "#FFE3C4" ], - "maxStrategies": 5, + "maxStrategies": 18, "conditions": [ { "label": "City Council District", From de735f8e5e393756da9ae0d550c6a477b21f32f3 Mon Sep 17 00:00:00 2001 From: Chen Wang Date: Mon, 8 Apr 2024 16:24:30 -0500 Subject: [PATCH 6/6] num of cpu change to 14 --- Chart.yaml | 1 + README.md | 1 + playbook-configs/galveston/datawolfWorkflow.config.dev.json | 2 +- playbook-configs/joplin/datawolfWorkflow.config.dev.json | 2 +- playbook-configs/joplin/datawolfWorkflow.config.prod.json | 2 +- playbook-configs/slc/datawolfWorkflow.config.dev.json | 2 +- playbook-configs/slc/datawolfWorkflow.config.prod.json | 2 +- 7 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index 83e1499..22d5cbf 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -50,3 +50,4 @@ annotations: - Update configuration for SLC Retrofit Strategy Builder - Update SLC regions and add new regions for Playbook Config - Update labels for Joplin Retrofit Strategy Builder + - Update number of CPUs for best performance diff --git a/README.md b/README.md index 6df7891..36c2d1e 100644 --- a/README.md +++ b/README.md @@ -108,6 +108,7 @@ For an example of using existing PVC, see the file [incore-pvc.yaml](incore-pvc. - Update configuration for SLC Retrofit Strategy Builder - Update slc regions and remove additional sector - Update labels for Joplin Retrofit Strategy Builder +- Update number of CPUs for best performance ### 1.25.3 - Update Galveston configuration CPU number to acheive best performance diff --git a/playbook-configs/galveston/datawolfWorkflow.config.dev.json b/playbook-configs/galveston/datawolfWorkflow.config.dev.json index 96b2751..3c183ea 100644 --- a/playbook-configs/galveston/datawolfWorkflow.config.dev.json +++ b/playbook-configs/galveston/datawolfWorkflow.config.dev.json @@ -306,7 +306,7 @@ "variableName": "numCPUs", "widget": null, "hidden": true, - "defaultValue": 8, + "defaultValue": 14, "parametersMap": [ { "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667", diff --git a/playbook-configs/joplin/datawolfWorkflow.config.dev.json b/playbook-configs/joplin/datawolfWorkflow.config.dev.json index 6bdf48a..56d6d63 100644 --- a/playbook-configs/joplin/datawolfWorkflow.config.dev.json +++ b/playbook-configs/joplin/datawolfWorkflow.config.dev.json @@ -541,7 +541,7 @@ "variableName": "numCpus", "widget": null, "hidden": true, - "defaultValue": 8, + "defaultValue": 14, "parametersMap": [ { "paramId": "937224ee-0e6c-40d7-dd2e-6a40018c1a02", diff --git a/playbook-configs/joplin/datawolfWorkflow.config.prod.json b/playbook-configs/joplin/datawolfWorkflow.config.prod.json index 3f237a9..c3c9878 100644 --- a/playbook-configs/joplin/datawolfWorkflow.config.prod.json +++ b/playbook-configs/joplin/datawolfWorkflow.config.prod.json @@ -541,7 +541,7 @@ "variableName": "numCpus", "widget": null, "hidden": true, - "defaultValue": 8, + "defaultValue": 14, "parametersMap": [ { "paramId": "937224ee-0e6c-40d7-dd2e-6a40018c1a02", diff --git a/playbook-configs/slc/datawolfWorkflow.config.dev.json b/playbook-configs/slc/datawolfWorkflow.config.dev.json index 3522033..02b23ce 100644 --- a/playbook-configs/slc/datawolfWorkflow.config.dev.json +++ b/playbook-configs/slc/datawolfWorkflow.config.dev.json @@ -306,7 +306,7 @@ "variableName": "numCPUs", "widget": null, "hidden": true, - "defaultValue": 8, + "defaultValue": 14, "parametersMap": [ { "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667", diff --git a/playbook-configs/slc/datawolfWorkflow.config.prod.json b/playbook-configs/slc/datawolfWorkflow.config.prod.json index 950b8da..ea3c727 100644 --- a/playbook-configs/slc/datawolfWorkflow.config.prod.json +++ b/playbook-configs/slc/datawolfWorkflow.config.prod.json @@ -306,7 +306,7 @@ "variableName": "numCPUs", "widget": null, "hidden": true, - "defaultValue": 8, + "defaultValue": 14, "parametersMap": [ { "paramId": "72d2212a-9aa6-4511-c0b8-6990e5f51667",