From 21184aaf68f007768f378888cd1bf2c79e875479 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Mon, 16 Mar 2026 13:21:58 -0700 Subject: [PATCH] Add software-library workspace --- .secrets.baseline | 77 ++++++++++++------- .../qa-mc2dp-helm/values/values.yaml | 41 +++++++++- 2 files changed, 88 insertions(+), 30 deletions(-) diff --git a/.secrets.baseline b/.secrets.baseline index bd8cf3a..d4a11fb 100644 --- a/.secrets.baseline +++ b/.secrets.baseline @@ -238,12 +238,54 @@ } ], "devplanetv2/dev-environments/georget/values/values.yaml": [ + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "7dfb83856b21e681c2f69d6fd408f91c3c0909a0", + "is_verified": false, + "line_number": 173 + }, + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "ec86f76184473d91ac1dfbe766809350b27ccd15", + "is_verified": false, + "line_number": 175 + }, { "type": "Base64 High Entropy String", "filename": "devplanetv2/dev-environments/georget/values/values.yaml", "hashed_secret": "6a62b38fba6774682f6062bedfe843faaac0b9d3", "is_verified": false, "line_number": 3407 + }, + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1", + "is_verified": false, + "line_number": 3486 + }, + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966", + "is_verified": false, + "line_number": 3489 + }, + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "79496491225eda4a7be9fcddee2825c85b1535cc", + "is_verified": false, + "line_number": 3518 + }, + { + "type": "Secret Keyword", + "filename": "devplanetv2/dev-environments/georget/values/values.yaml", + "hashed_secret": "7120244dce59930b75711144fda4b1f6d78e4865", + "is_verified": false, + "line_number": 3544 } ], "devplanetv2/dev-environments/gomezmh/values/values.yaml": [ @@ -344,35 +386,35 @@ "filename": "devplanetv2/dev-environments/pauline-helm/values/values.yaml", "hashed_secret": "6a62b38fba6774682f6062bedfe843faaac0b9d3", "is_verified": false, - "line_number": 1671 + "line_number": 1675 }, { "type": "Secret Keyword", "filename": "devplanetv2/dev-environments/pauline-helm/values/values.yaml", "hashed_secret": "0447a636536df0264b2000403fbefd69f603ceb1", "is_verified": false, - "line_number": 1728 + "line_number": 1732 }, { "type": "Secret Keyword", "filename": "devplanetv2/dev-environments/pauline-helm/values/values.yaml", "hashed_secret": "ca253d1c9dece2da0d6fb24ded7bdb849a475966", "is_verified": false, - "line_number": 1731 + "line_number": 1735 }, { "type": "Secret Keyword", "filename": "devplanetv2/dev-environments/pauline-helm/values/values.yaml", "hashed_secret": "79496491225eda4a7be9fcddee2825c85b1535cc", "is_verified": false, - "line_number": 1760 + "line_number": 1764 }, { "type": "Secret Keyword", "filename": "devplanetv2/dev-environments/pauline-helm/values/values.yaml", "hashed_secret": "0cc8bac3fabe63722716d1e6fe04a8dded1e3ad0", "is_verified": false, - "line_number": 1776 + "line_number": 1780 } ], "devplanetv2/dev-environments/piotr/values/values.yaml": [ @@ -553,29 +595,6 @@ "line_number": 1136 } ], - "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml": [ - { - "type": "Secret Keyword", - "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml", - "hashed_secret": "1d751f23f0557dd1daf0c8d87bec7693a213f397", - "is_verified": false, - "line_number": 590 - }, - { - "type": "Secret Keyword", - "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml", - "hashed_secret": "c7c78012f4993fdc2142b0e7251f557c4e24ca01", - "is_verified": false, - "line_number": 597 - }, - { - "type": "Secret Keyword", - "filename": "devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml", - "hashed_secret": "84bc25233d003b8efdd2f8a2b67a4d942c0b63bf", - "is_verified": false, - "line_number": 600 - } - ], "devplanetv2/dev-environments/qa-midrc-helm/values/values.yaml": [ { "type": "Secret Keyword", @@ -738,5 +757,5 @@ } ] }, - "generated_at": "2026-03-05T22:11:43Z" + "generated_at": "2026-03-16T20:21:53Z" } diff --git a/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml b/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml index 966a266..21f6d2f 100644 --- a/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml +++ b/devplanetv2/dev-environments/qa-mc2dp-helm/values/values.yaml @@ -135,7 +135,8 @@ hatchery: replicaCount: 2 image: repository: 707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery - tag: "2026.02" + # tag: "2026.02" + tag: "feat_s3-mount" hatchery: json: | { @@ -146,6 +147,11 @@ hatchery: "workspace_type": "Trial Workspace", "local": true }, + "s3-config": { + "bucketName": "workspace-software-s3-qa-brh", + "prefixBase": "qa-prometheus", + "region": "us-east-1" + }, "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", @@ -169,6 +175,39 @@ hatchery: ] }, "containers": [ + { + "target-port": 8888, + "cpu-limit": "2.0", + "memory-limit": "8Gi", + "name": "(Generic) Software Library Testing", + "image": "quay.io/cdis/jupyterlab-generic:master", + "env": { + "FRAME_ANCESTORS": "https://qa-prometheus.planx-pla.net" + }, + "args": [ + "--ServerApp.base_url=/lw-workspace/proxy/", + "--ServerApp.default_url=/lab", + "--ServerApp.password=''", + "--ServerApp.token=''", + "--ServerApp.notebook_dir='/home/jovyan'", + "--ServerApp.shutdown_no_activity_timeout=3600" + ], + "command": [ + "/jupyterlab-start.sh" + ], + "path-rewrite": "/lw-workspace/proxy/", + "use-tls": "false", + "ready-probe": "/lw-workspace/proxy/", + "lifecycle-post-start": [ + "/bin/sh", + "-c", + "export IAM=`whoami`; rm -rf /home/$IAM/pd/dockerHome; rm -rf /home/$IAM/pd/lost+found; ln -s /data /home/$IAM/; rm /home/$IAM/pd/data; true" + ], + "user-uid": 1010, + "fs-gid": 100, + "user-volume-location": "/home/jovyan/pd", + "gen3-volume-location": "/home/jovyan/.gen3" + }, { "target-port": 8888, "cpu-limit": "1.0",