Skip to content

Commit 0355f70

Browse files
authored
Merge branch 'master' into chore/apply_monthly_release_2026.02_to_midrcprod_staging.midrc.org_1771345370
2 parents 158eba2 + 3007639 commit 0355f70

File tree

8 files changed

+29
-24
lines changed

8 files changed

+29
-24
lines changed

brhprod/brhstaging.data-commons.org/values/values.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ gen3-discovery-ai:
7373
tag: 1.1.0
7474
gen3-workflow:
7575
enabled: true
76+
image:
77+
tag: chore_add_helm_deployment_doc
7678
serviceAccount:
7779
annotations:
7880
eks.amazonaws.com/role-arn: "arn:aws:iam::885078588865:role/brhprod--brhstaging-helm--gen3-workflow"

ci/perf/values/fence.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
fence:
2+
resources:
3+
requests:
4+
cpu: "50m"
25
# -- (map) External Secrets settings.
36
externalSecrets:
47
createK8sJwtKeysSecret: false

ci/perf/values/guppy.yaml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ guppy:
66
resources:
77
requests:
88
memory: "105Mi"
9-
cpu: "15m"
9+
cpu: "50m"
1010
enabled: true
1111
#TO DO Re-enable once ES index restore is added to modify values script
1212
dbRestore: false
@@ -30,5 +30,3 @@ guppy:
3030
type: imaging_study
3131
configIndex: ci_configs_alias
3232
authFilterField: auth_resource_path
33-
autoscaling:
34-
enabled: true

ci/perf/values/values.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ indexd:
8080
resources:
8181
requests:
8282
memory: "105Mi"
83-
cpu: "15m"
83+
cpu: "50m"
8484
# This will be dynamically replaced by env_setup.sh script.
8585
defaultPrefix: ""
8686
enabled: true
@@ -323,7 +323,7 @@ sheepdog:
323323
resources:
324324
requests:
325325
memory: "105Mi"
326-
cpu: "15m"
326+
cpu: "50m"
327327
enabled: true
328328
authNamespace: ''
329329
image:
@@ -339,7 +339,7 @@ peregrine:
339339
resources:
340340
requests:
341341
memory: "105Mi"
342-
cpu: "15m"
342+
cpu: "50m"
343343
enabled: true
344344
image:
345345
repository: "quay.io/cdis/peregrine"
@@ -408,7 +408,7 @@ arborist:
408408
resources:
409409
requests:
410410
memory: "105Mi"
411-
cpu: "15m"
411+
cpu: "50m"
412412
enabled: true
413413
image:
414414
repository: "quay.io/cdis/arborist"
@@ -438,7 +438,7 @@ revproxy:
438438
resources:
439439
requests:
440440
memory: "105Mi"
441-
cpu: "15m"
441+
cpu: "50m"
442442

443443

444444
wts:

healprod/healdata.org/values/values.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ hatchery:
213213
"target-port": 8888,
214214
"cpu-limit": "1.0",
215215
"memory-limit": "2Gi",
216-
"name": "(Generic) Jupyter Lab Notebook with R Kernel",
216+
"name": "JupyterLab with Python and R Kernels",
217217
"image": "quay.io/cdis/heal-notebooks:generic_rkernel__518649830a512a48eb4727ffa56d3a87b08d427c",
218218
"env": {
219219
"FRAME_ANCESTORS": "https://healdata.org"
@@ -248,7 +248,7 @@ hatchery:
248248
"target-port": 8888,
249249
"cpu-limit": "1.0",
250250
"memory-limit": "2Gi",
251-
"name": "(Generic, User-licensed) Stata Notebook ",
251+
"name": "JupyterLab with User-Licensed Stata",
252252
"image": "quay.io/cdis/jupyter-pystata-user-licensed:3.1.1",
253253
"env": {
254254
"FRAME_ANCESTORS": "https://healdata.org"
@@ -283,7 +283,7 @@ hatchery:
283283
"target-port": 8888,
284284
"cpu-limit": "1.0",
285285
"memory-limit": "2Gi",
286-
"name": "(Generic, Limited Gen3-licensed) Stata Notebook",
286+
"name": "JupyterLab with Shared Stata License",
287287
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:3.1.1",
288288
"env": {
289289
"FRAME_ANCESTORS": "https://healdata.org"
@@ -328,7 +328,7 @@ hatchery:
328328
"target-port": 8888,
329329
"cpu-limit": "1.0",
330330
"memory-limit": "2Gi",
331-
"name": "(Tutorials) Example Analysis Jupyter Lab Notebooks",
331+
"name": "Use JupyterLab with Example Analysis Notebooks",
332332
"image": "quay.io/cdis/heal-notebooks:combined_tutorials__efec6b81db6f08d1c94f610463951610410a96ce",
333333
"env": {
334334
"FRAME_ANCESTORS": "https://healdata.org"

healprod/preprod.healdata.org/values/values.yaml

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
ambassador:
22
jupyterNamespace: jupyter-pods-healpreprod
33
arborist:
4-
replicaCount: 4
4+
replicaCount: 2
55
autoscaling:
66
enabled: false
77
maxReplicas: 1
@@ -59,7 +59,7 @@ fence:
5959
serviceAccount:
6060
annotations:
6161
eks.amazonaws.com/role-arn: arn:aws:iam::205252583234:role/healprod--healpreprod-helm--audit-sqs-sender
62-
replicaCount: 4
62+
replicaCount: 2
6363
autoscaling:
6464
enabled: false
6565
maxReplicas: 1
@@ -155,11 +155,13 @@ global:
155155
revproxyArn: arn:aws:acm:us-east-1:205252583234:certificate/8bb3d424-be34-493c-a43b-e2c686c9dc6c
156156
hatchery:
157157
enabled: true
158+
replicaCount: 3
158159
externalSecrets:
159160
stataG3auto: stata-workspace-gen3-license-preprod-heal
160161
image:
161162
repository: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery
162-
tag: '2026.01'
163+
# tag: '2026.01'
164+
tag: 'fix_idempotent-cost-track'
163165
hatchery:
164166
json: |-
165167
{
@@ -170,11 +172,11 @@ hatchery:
170172
"user-namespace": "jupyter-pods-healpreprod",
171173
"sub-dir": "/lw-workspace",
172174
"user-volume-size": "10Gi",
173-
"pay-models-dynamodb-table": "bmh-admin-portal-backend-bmhworkspacetableD4D73E43-1SZM8FA8IP6F",
175+
"pay-models-dynamodb-table": "bmh-admin-portal-backend-bmhworkspacetableD4D73E43-1SZM8FA8IP6F-preprod",
174176
"default-pay-model": {
175177
"bmh_workspace_id": "blanket_billing_eks",
176178
"region": "us-east-1",
177-
"account_id": "252835817747",
179+
"local": true,
178180
"workspace_type": "healworkspaces",
179181
"hard-limit": 5,
180182
"soft-limit": 4
@@ -209,7 +211,7 @@ hatchery:
209211
"target-port": 8888,
210212
"cpu-limit": "1.0",
211213
"memory-limit": "2Gi",
212-
"name": "(Generic) Jupyter Lab Notebook with R Kernel",
214+
"name": "JupyterLab with Python and R Kernels",
213215
"image": "quay.io/cdis/heal-notebooks:generic_rkernel__518649830a512a48eb4727ffa56d3a87b08d427c",
214216
"env": {
215217
"FRAME_ANCESTORS": "https://preprod.healdata.org"
@@ -244,7 +246,7 @@ hatchery:
244246
"target-port": 8888,
245247
"cpu-limit": "1.0",
246248
"memory-limit": "2Gi",
247-
"name": "(Generic, User-licensed) Stata Notebook ",
249+
"name": "JupyterLab with User-Licensed Stata",
248250
"image": "quay.io/cdis/jupyter-pystata-user-licensed:3.1.1",
249251
"env": {
250252
"FRAME_ANCESTORS": "https://preprod.healdata.org"
@@ -278,7 +280,7 @@ hatchery:
278280
"target-port": 8888,
279281
"cpu-limit": "1.0",
280282
"memory-limit": "2Gi",
281-
"name": "(Generic, Limited Gen3-licensed) Stata Notebook",
283+
"name": "JupyterLab with Shared Stata License",
282284
"image": "quay.io/cdis/jupyter-pystata-gen3-licensed:3.1.1",
283285
"env": {
284286
"FRAME_ANCESTORS": "https://preprod.healdata.org"
@@ -323,7 +325,7 @@ hatchery:
323325
"target-port": 8888,
324326
"cpu-limit": "1.0",
325327
"memory-limit": "2Gi",
326-
"name": "(Tutorials) Example Analysis Jupyter Lab Notebooks",
328+
"name": "Use JupyterLab with Example Analysis Notebooks",
327329
"image": "quay.io/cdis/heal-notebooks:combined_tutorials__efec6b81db6f08d1c94f610463951610410a96ce",
328330
"env": {
329331
"FRAME_ANCESTORS": "https://preprod.healdata.org"

midrcprod/staging.midrc.org/values/portal/gitops.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -235,10 +235,10 @@
235235
"navigation": {
236236
"items": [
237237
{
238-
"name": "Discovery",
238+
"name": "Datasets",
239239
"link": "/discovery",
240240
"icon": "query",
241-
"tooltip": "Dataset discovery"
241+
"tooltip": "The Datasets page provides free-text and tag-based search over published datasets in MIDRC along with links to publications and data download buttons."
242242
},
243243
{
244244
"name": "Exploration",

vadcprod/vpodc.data-commons.org/values/values.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ guppy:
162162
esEndpoint: http://elasticsearch:9200
163163
image:
164164
repository: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/guppy
165-
tag: '2025.12'
165+
tag: '2026.02'
166166
indices:
167167
- index: etl_mickey
168168
type: patients

0 commit comments

Comments
 (0)