diff --git a/airflow/dags/cwl_dag.py b/airflow/dags/cwl_dag.py index e3dfaa82..27f02d62 100644 --- a/airflow/dags/cwl_dag.py +++ b/airflow/dags/cwl_dag.py @@ -25,7 +25,7 @@ # The Kubernetes namespace within which the Pod is run (it must already exist) POD_NAMESPACE = "sps" POD_LABEL = "cwl_task" -SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.2.0" +SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.3.0" NODE_POOL_DEFAULT = "airflow-kubernetes-pod-operator" NODE_POOL_HIGH_WORKLOAD = "airflow-kubernetes-pod-operator-high-workload" diff --git a/airflow/dags/sbg_preprocess_cwl_dag.py b/airflow/dags/sbg_preprocess_cwl_dag.py index 7fcc403f..346f9ff4 100644 --- a/airflow/dags/sbg_preprocess_cwl_dag.py +++ b/airflow/dags/sbg_preprocess_cwl_dag.py @@ -17,7 +17,7 @@ # The Kubernetes namespace within which the Pod is run (it must already exist) POD_NAMESPACE = "sps" POD_LABEL = "sbg_preprocess_task" -SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.2.0" +SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.3.0" # The path of the working directory where the CWL workflow is executed # (aka the starting directory for cwl-runner). diff --git a/airflow/docker/custom_airflow/Dockerfile b/airflow/docker/custom_airflow/Dockerfile index ceb0199d..e91c818c 100644 --- a/airflow/docker/custom_airflow/Dockerfile +++ b/airflow/docker/custom_airflow/Dockerfile @@ -1,4 +1,4 @@ -FROM apache/airflow:2.10.0-python3.11 +FROM apache/airflow:2.10.3-python3.11 RUN pip install cwltool==3.1.20240112164112 RUN pip install boto3==1.34.89 diff --git a/airflow/plugins/unity_sps_utils.py b/airflow/plugins/unity_sps_utils.py index 57e6e244..b06555f5 100644 --- a/airflow/plugins/unity_sps_utils.py +++ b/airflow/plugins/unity_sps_utils.py @@ -8,7 +8,7 @@ # Shared constants POD_NAMESPACE = "sps" # The Kubernetes namespace within which the Pod is run (it must already exist) POD_LABEL = "cwl_task" -SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.2.0" +SPS_DOCKER_CWL_IMAGE = "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.3.0" NODE_POOL_DEFAULT = "airflow-kubernetes-pod-operator" NODE_POOL_HIGH_WORKLOAD = "airflow-kubernetes-pod-operator-high-workload" diff --git a/ogc-application-packages/sbg_preprocess_cwl_dag.json b/ogc-application-packages/sbg_preprocess_cwl_dag.json index 95eeea42..b1cd9aaa 100644 --- a/ogc-application-packages/sbg_preprocess_cwl_dag.json +++ b/ogc-application-packages/sbg_preprocess_cwl_dag.json @@ -1,6 +1,6 @@ { "executionUnit": { - "image": "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.2.0", + "image": "ghcr.io/unity-sds/unity-sps/sps-docker-cwl:2.3.0", "type": "docker" }, "processDescription": { diff --git a/pyproject.toml b/pyproject.toml index 813fc647..1dc1e3ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "unity-sps" -version = "2.2.0" +version = "2.3.0" authors = [ { name = "Drew Meyers", email = "drew.meyers@jpl.nasa.gov" }, { name = "Luca Cinquini", email = "luca.cinquini@jpl.nasa.gov" }, @@ -40,7 +40,7 @@ test = [ "pytest-bdd==7.2.0", "pytest-mock==3.14.0", "requests==2.32.3", - "apache-airflow==2.10.0", + "apache-airflow==2.10.3", "kubernetes==29.0.0", "boto3==1.34.46", "backoff==2.2.1", diff --git a/terraform-unity/README.md b/terraform-unity/README.md index 0e5b28ee..419b6baa 100644 --- a/terraform-unity/README.md +++ b/terraform-unity/README.md @@ -187,7 +187,7 @@ terraform apply -no-color 2>&1 | tee apply_output.txt | Name | Description | Type | Default | Required | |------|-------------|------|---------|:--------:| -| [airflow\_docker\_images](#input\_airflow\_docker\_images) | Docker images for the associated Airflow services. |
object({|
airflow = object({
name = string
tag = string
})
})
{| no | +| [airflow\_docker\_images](#input\_airflow\_docker\_images) | Docker images for the associated Airflow services. |
"airflow": {
"name": "ghcr.io/unity-sds/unity-sps/sps-airflow",
"tag": "2.2.0"
}
}
object({|
airflow = object({
name = string
tag = string
})
})
{| no | | [airflow\_webserver\_password](#input\_airflow\_webserver\_password) | The password for the Airflow webserver and UI. | `string` | n/a | yes | | [airflow\_webserver\_username](#input\_airflow\_webserver\_username) | The username for the Airflow webserver and UI. | `string` | `"admin"` | no | | [dag\_catalog\_repo](#input\_dag\_catalog\_repo) | Git repository that stores the catalog of Airflow DAGs. |
"airflow": {
"name": "ghcr.io/unity-sds/unity-sps/sps-airflow",
"tag": "2.3.0"
}
}
object({|
url = string
ref = string
dags_directory_path = string
})
{| no | diff --git a/terraform-unity/variables.tf b/terraform-unity/variables.tf index 12c65107..dfe3d4e5 100644 --- a/terraform-unity/variables.tf +++ b/terraform-unity/variables.tf @@ -73,7 +73,7 @@ variable "airflow_docker_images" { default = { airflow = { name = "ghcr.io/unity-sds/unity-sps/sps-airflow" - tag = "2.2.0" + tag = "2.3.0" } } }
"dags_directory_path": "airflow/dags",
"ref": "2.2.0",
"url": "https://github.com/unity-sds/unity-sps.git"
}