Skip to content

Commit

Permalink
support EJR in batch job driver #792
Browse files Browse the repository at this point in the history
  • Loading branch information
bossie authored Jun 7, 2024
1 parent 4885f5f commit ba1135a
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 2 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ without compromising stable operations.

## Unreleased

## 0.38.4

- Fix load_stac from unsigned job results URL in batch jobs ([#792](https://github.com/Open-EO/openeo-geopyspark-driver/issues/792))

## 0.38.3

Expand Down
2 changes: 1 addition & 1 deletion openeogeotrellis/_version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.38.3a1"
__version__ = "0.38.4a1"
3 changes: 3 additions & 0 deletions openeogeotrellis/backend.py
Original file line number Diff line number Diff line change
Expand Up @@ -2023,6 +2023,9 @@ def as_arg_element(dependency: dict) -> dict:
access_token=user.internal_auth_data["access_token"],
fuse_mount_batchjob_s3_bucket=get_backend_config().fuse_mount_batchjob_s3_bucket,
UDF_PYTHON_DEPENDENCIES_FOLDER_NAME=UDF_PYTHON_DEPENDENCIES_FOLDER_NAME,
openeo_ejr_api=get_backend_config().ejr_api,
openeo_ejr_backend_id=get_backend_config().ejr_backend_id,
openeo_ejr_oidc_client_credentials=os.environ.get("OPENEO_EJR_OIDC_CLIENT_CREDENTIALS"),
)

if get_backend_config().fuse_mount_batchjob_s3_bucket:
Expand Down
2 changes: 1 addition & 1 deletion openeogeotrellis/deploy/batch_job.py
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ def run_job(
logger.exception(f"Failed extracting and installing UDF dependencies: {e}")

backend_implementation = GeoPySparkBackendImplementation(
use_job_registry=False,
use_job_registry=bool(get_backend_config().ejr_api),
)

if default_sentinel_hub_credentials is not None:
Expand Down
6 changes: 6 additions & 0 deletions openeogeotrellis/deploy/sparkapplication_template.yaml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,12 @@ spec:
value: "TRUE"
- name: FUSE_MOUNT_BATCHJOB_S3_BUCKET
value: "{{fuse_mount_batchjob_s3_bucket}}"
- name: OPENEO_EJR_API
value: {{ openeo_ejr_api }}
- name: OPENEO_EJR_BACKEND_ID
value: {{ openeo_ejr_backend_id }}
- name: OPENEO_EJR_OIDC_CLIENT_CREDENTIALS
value: {{ openeo_ejr_oidc_client_credentials }}
{%- endblock %}
labels:
{%- block driver_labels %}
Expand Down

0 comments on commit ba1135a

Please sign in to comment.