From a65d879edc8c085d14a5828eef3ed483b466249d Mon Sep 17 00:00:00 2001 From: George Thomas Date: Thu, 4 Jan 2024 10:32:30 -0800 Subject: [PATCH 1/4] (HP-572) add fields for dynamodb for hatchery --- qa-heal.planx-pla.net/manifests/hatchery/hatchery.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json index 9d16dc4dd..a3a957668 100644 --- a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json @@ -2,6 +2,12 @@ "user-namespace": "jupyter-pods-qa-heal", "sub-dir": "/lw-workspace", "user-volume-size": "10Gi", + "gen3-license-user-maps-dynamodb-table": "gen3-license-user-maps", + "gen3-license-type": "STATA-HEAL", + "gen3-license-max-ids": 6, + "gen3-g3auto-name": "stata-workspace-gen3-license-g3auto", + "gen3-g3auto-key": "stata_license.txt", + "gen3-license-file-path": "stata.lic", "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", From cc0bde10b310c9868faea39b86c365f28755d0e5 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Thu, 4 Jan 2024 10:45:48 -0800 Subject: [PATCH 2/4] (HP-572) use branch for gen3-licensed notebook container image --- qa-heal.planx-pla.net/manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json index a3a957668..4e7138cdb 100644 --- a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json @@ -105,7 +105,7 @@ "cpu-limit": "1.0", "memory-limit": "2Gi", "name": "(Generic, Limited Gen3-licensed) Stata Notebook", - "image": "quay.io/cdis/jupyter-pystata-gen3-licensed:1.2.0", + "image": "quay.io/cdis/jupyter-pystata-gen3-licensed:chore_get-stata-license-from-sidecar", "env": { "FRAME_ANCESTORS": "https://qa-heal.planx-pla.net" }, From 75e1b215aa7c26630a8aa1118a24561dd777e0e9 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Thu, 4 Jan 2024 13:05:36 -0800 Subject: [PATCH 3/4] (HP-572) use new release of sidecar with file-mounting --- qa-heal.planx-pla.net/manifests/hatchery/hatchery.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json index 4e7138cdb..d8df37085 100644 --- a/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json +++ b/qa-heal.planx-pla.net/manifests/hatchery/hatchery.json @@ -11,7 +11,7 @@ "sidecar": { "cpu-limit": "1.0", "memory-limit": "256Mi", - "image": "quay.io/cdis/ecs-ws-sidecar:2023.12", + "image": "quay.io/cdis/ecs-ws-sidecar:0.1.0", "env": { "NAMESPACE": "qa-heal" }, From cf5a67cc6af5afca2b238a2f2827186b4f76da72 Mon Sep 17 00:00:00 2001 From: George Thomas Date: Thu, 4 Jan 2024 13:11:08 -0800 Subject: [PATCH 4/4] (HP-572) use branch of hatchery for testing --- qa-heal.planx-pla.net/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qa-heal.planx-pla.net/manifest.json b/qa-heal.planx-pla.net/manifest.json index 96ee07d30..8c125fd47 100644 --- a/qa-heal.planx-pla.net/manifest.json +++ b/qa-heal.planx-pla.net/manifest.json @@ -16,7 +16,7 @@ "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2023.12", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", "frontend-framework": "quay.io/cdis/frontend-framework:0.5.1", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2023.12", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:chore_use-dynamodb-gen3-user-license", "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2023.12", "kayako-wrapper": "quay.io/cdis/kayako-wrapper-service:0.2.1", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2023.12",