From b15966c6d267b978ce3e5b635d67f8352b446757 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Fri, 25 Oct 2024 12:35:54 -0500 Subject: [PATCH 1/3] feat(va-testing.data-commons.org): test deployment on 20241028 --- va-testing.data-commons.org/manifest.json | 32 +++++++++---------- .../manifests/hatchery/hatchery.json | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index ac2f66f446..36eec4b834 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -8,25 +8,25 @@ }, "versions": { "ambassador": "quay.io/datawire/ambassador:1.14.4", - "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.09", + "arborist": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/arborist:2024.10", "argo-wrapper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/argo-wrapper:2.2.3", - "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.09", + "awshelper": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/awshelper:2024.10", "cohort-middleware": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/cohort-middleware:0.4.7", - "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.09", - "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:10.2.0", + "dashboard": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3-statics:2024.10", + "fence": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/fence:2024.10", "fluentd": "fluent/fluentd-kubernetes-daemonset:v1.15.3-debian-cloudwatch-1.0", - "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.09", - "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.09", - "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.09", - "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.09", - "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:feat_enable_cohort_characterization", + "hatchery": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/hatchery:2024.10", + "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", + "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", + "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", + "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.08.19", "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.08.19", - "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.09", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:5.33.1", - "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.09", - "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.09", - "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.09", - "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.09" + "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:fix_enable_legacy_vs_new_data_dictionary_va", + "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", + "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", + "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10", + "wts": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/workspace-token-service:2024.10" }, "global": { "environment": "va-testing", @@ -46,7 +46,7 @@ }, "ssjdispatcher": { "job_images": { - "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.09" + "indexing": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexs3client:2024.10" } }, "canary": { diff --git a/va-testing.data-commons.org/manifests/hatchery/hatchery.json b/va-testing.data-commons.org/manifests/hatchery/hatchery.json index 51154bea7d..5d113dcb56 100644 --- a/va-testing.data-commons.org/manifests/hatchery/hatchery.json +++ b/va-testing.data-commons.org/manifests/hatchery/hatchery.json @@ -5,7 +5,7 @@ "sidecar": { "cpu-limit": "0.1", "memory-limit": "128Mi", - "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.09", + "image": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/gen3fuse-sidecar:2024.10", "env": { "NAMESPACE": "default", "HOSTNAME": "va-testing.data-commons.org" From 6888e09a9a045ceac007253e3f8f94a179d21ce0 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Fri, 25 Oct 2024 12:39:23 -0500 Subject: [PATCH 2/3] feat(va-testing.data-commons.org): 508 changes from prod --- va-testing.data-commons.org/portal/gitops.css | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/va-testing.data-commons.org/portal/gitops.css b/va-testing.data-commons.org/portal/gitops.css index fe7a78d179..6669e4b731 100644 --- a/va-testing.data-commons.org/portal/gitops.css +++ b/va-testing.data-commons.org/portal/gitops.css @@ -1,3 +1,18 @@ +:root { + --g3-color__base-blue: #194C90; + --g3-color__base-blue-light: #2466AC; + + --g3-color__highlight-orange-white-text: #994A03; + --g3-color__highlight-orange-white-text-light: #B35F05; + + --g3-primary-btn__bg-color: var(--g3-color__highlight-orange-white-text-light); + --g3-primary-btn__bg-color--hover: var(--g3-color__highlight-orange-white-text); + +} + +.popup__title { + background-color: var(--g3-color__base-blue); +} .nav-bar__logo { padding: 10px 0; } From 072acfd845b879477121a8633a5669f8a56fd335 Mon Sep 17 00:00:00 2001 From: Andrew Prokhorenkov Date: Fri, 25 Oct 2024 15:06:00 -0500 Subject: [PATCH 3/3] feat(va-testing.data-commons.org): update --- va-testing.data-commons.org/manifest.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/va-testing.data-commons.org/manifest.json b/va-testing.data-commons.org/manifest.json index 36eec4b834..bc300759c0 100644 --- a/va-testing.data-commons.org/manifest.json +++ b/va-testing.data-commons.org/manifest.json @@ -19,10 +19,10 @@ "indexd": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/indexd:2024.10", "manifestservice": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/manifestservice:2024.10", "metadata": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/metadata-service:2024.10", - "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:VA-pre-2024.08.19", + "ohdsi-atlas": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-atlas:feat_enable_cohort_characterization", "ohdsi-webapi": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ohdsi-webapi:VA-pre-2024.08.19", "peregrine": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/peregrine:2024.10", - "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:fix_enable_legacy_vs_new_data_dictionary_va", + "portal": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/data-portal:VA-pre-2024.10.25", "revproxy": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/nginx:2024.10", "sheepdog": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/sheepdog:2024.10", "ssjdispatcher": "707767160287.dkr.ecr.us-east-1.amazonaws.com/gen3/ssjdispatcher:2024.10",