From e901f6abfa1cead63d8b141cead408b2df220819 Mon Sep 17 00:00:00 2001 From: Matt Savoie Date: Wed, 4 Dec 2024 10:21:20 -0700 Subject: [PATCH] DAS-2254: updates service name and image service name. --- config/services.yml | 4 ++-- docs/guides/managing-existing-services.md | 2 +- packages/util/env-defaults | 2 +- services/harmony/env-defaults | 4 ++-- services/harmony/test/versions.ts | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/config/services.yml b/config/services.yml index cc93488e1..d11483b75 100644 --- a/config/services.yml +++ b/config/services.yml @@ -1039,7 +1039,7 @@ https://cmr.uat.earthdata.nasa.gov: is_sequential: true - image: !Env ${HYBIG_IMAGE} - - name: sds/smap-l2-gridder + - name: sds/harmony-smap-l2-gridder description: | Harmony SMAP L2 Gridding Service. Takes L2G trajectories and reformats the data into the appropriate gridded output. data_operation_version: '0.20.0' @@ -1049,7 +1049,7 @@ https://cmr.uat.earthdata.nasa.gov: <<: *default-turbo-params env: <<: *default-turbo-env - STAGING_PATH: public/sds/smap-l2-gridder + STAGING_PATH: public/sds/harmony-smap-l2-gridder umm_s: S1272606802-EEDTEST capabilities: concatenation: false diff --git a/docs/guides/managing-existing-services.md b/docs/guides/managing-existing-services.md index b83404d85..13a8dddf7 100644 --- a/docs/guides/managing-existing-services.md +++ b/docs/guides/managing-existing-services.md @@ -22,6 +22,7 @@ The returned JSON response is a map of canonical service names to tags: "harmony-service-example": "latest", "harmony-netcdf-to-zarr": "latest", "harmony-regridder": "latest", + "harmony-smap-l2-gridder": "latest", "swath-projector": "latest", "hoss": "latest", "sds-maskfill": "latest", @@ -31,7 +32,6 @@ The returned JSON response is a map of canonical service names to tags: "podaac-ps3": "latest", "podaac-netcdf-converter": "latest", "query-cmr": "latest", - "smap-l2-gridder": "latest", "giovanni-time-series-adapter": "latest", "geoloco": "latest", "subset-band-name": "latest" diff --git a/packages/util/env-defaults b/packages/util/env-defaults index e80e8be83..09cd747d3 100644 --- a/packages/util/env-defaults +++ b/packages/util/env-defaults @@ -115,7 +115,7 @@ HYBIG_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-browse-image-generator:latest,h HARMONY_SERVICE_EXAMPLE_SERVICE_QUEUE_URLS='["harmonyservices/service-example:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/harmony-service-example.fifo"]' HARMONY_NETCDF_TO_ZARR_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-netcdf-to-zarr:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/harmony-netcdf-to-zarr.fifo"]' HARMONY_REGRIDDER_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-regridding-service:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/harmony-regridder.fifo"]' -SMAP_L2_GRIDDER_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-smap-l2-gridding-service:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/smap-l2-gridder.fifo"]' +SMAP_L2_GRIDDER_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-smap-l2-gridder:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/harmony-smap-l2-gridder.fifo"]' SWATH_PROJECTOR_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-swath-projector:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/swath-projector.fifo"]' HOSS_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-opendap-subsetter:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/hoss.fifo"]' SDS_MASKFILL_SERVICE_QUEUE_URLS='["sds/maskfill-harmony:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/sds-maskfill.fifo"]' diff --git a/services/harmony/env-defaults b/services/harmony/env-defaults index 0e8067cf8..0d170763b 100644 --- a/services/harmony/env-defaults +++ b/services/harmony/env-defaults @@ -537,8 +537,8 @@ OPERA_RTC_S1_BROWSE_LIMITS_MEMORY=512Mi OPERA_RTC_S1_BROWSE_INVOCATION_ARGS='/usr/local/bin/_entrypoint.sh python -m opera_rtc_s1_browse.harmony_service' OPERA_RTC_S1_BROWSE_SERVICE_QUEUE_URLS='["ghcr.io/asfhyp3/opera-rtc-s1-browse:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/opera-rtc-s1-browse.fifo"]' -SMAP_L2_GRIDDER_IMAGE=ghcr.io/nasa/harmony-smap-l2-gridding-service:latest +SMAP_L2_GRIDDER_IMAGE=ghcr.io/nasa/harmony-smap-l2-gridder:latest SMAP_L2_GRIDDER_REQUESTS_MEMORY=128Mi SMAP_L2_GRIDDER_LIMITS_MEMORY=8Gi SMAP_L2_GRIDDER_INVOCATION_ARGS='python -m harmony_service' -SMAP_L2_GRIDDER_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-smap-l2-gridding-service:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/smap-l2-gridder.fifo"]' +SMAP_L2_GRIDDER_SERVICE_QUEUE_URLS='["ghcr.io/nasa/harmony-smap-l2-gridder:latest,http://sqs.us-west-2.localhost.localstack.cloud:4566/000000000000/harmony-smap-l2-gridder.fifo"]' diff --git a/services/harmony/test/versions.ts b/services/harmony/test/versions.ts index 93c712670..db0c36401 100644 --- a/services/harmony/test/versions.ts +++ b/services/harmony/test/versions.ts @@ -36,8 +36,8 @@ describe('Versions endpoint', function () { 'sds/trajectory-subsetter', 'net2cog', 'nasa/harmony-gdal-adapter', + 'sds/harmony-smap-l2-gridder', 'sds/HyBIG', - 'sds/smap-l2-gridder', 'sds/HOSS-geographic', 'sds/HOSS-projection-gridded', 'harmony/netcdf-to-zarr',