Skip to content

Cache terrakit data fetch #62

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Beldine-Moturi wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Cache terrakit data fetch #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ba4bc3
Merge branch 'main' into cache-terrakit-data-fetch
Beldine-Moturi Apr 21, 2026
6b9fd00
feat: add cache to terrakit data fetch
Beldine-Moturi Apr 21, 2026
0fe813b
fix: update values and secrets for terrakit cache
Beldine-Moturi Apr 23, 2026
4e5cc15
move cache dir creation to pipelines dockerfile
Beldine-Moturi Apr 27, 2026
5ecaa60
Create pipelines data pvc
Beldine-Moturi Apr 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .secrets.baseline
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"files": "^.secrets.baseline$",
"lines": null
},
"generated_at": "2026-04-10T16:09:14Z",
"generated_at": "2026-04-23T10:54:31Z",
"plugins_used": [
{
"name": "AWSKeyDetector"
Expand Down Expand Up @@ -870,15 +870,15 @@
"hashed_secret": "8e9e0a058630388dcbb497903ec1a5b03e3781f9",
"is_secret": false,
"is_verified": false,
"line_number": 53,
"line_number": 56,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "055abb8b464ae0ab2bb7e9d2fa150c641fee8334",
"is_secret": false,
"is_verified": false,
"line_number": 58,
"line_number": 61,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down Expand Up @@ -1041,39 +1041,39 @@
"hashed_secret": "66cf0e57ff0c4392b01bfadcd28759c621938a02",
"is_secret": false,
"is_verified": false,
"line_number": 358,
"line_number": 360,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "64955456d46405ff355b3abc0cf74a4ff9bdf283",
"is_secret": false,
"is_verified": false,
"line_number": 361,
"line_number": 363,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "90c3cc8d4eae70f6a1e7c2a9c88a57d5d9623deb",
"is_secret": false,
"is_verified": false,
"line_number": 369,
"line_number": 371,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "8e9e0a058630388dcbb497903ec1a5b03e3781f9",
"is_secret": false,
"is_verified": false,
"line_number": 373,
"line_number": 375,
"type": "Secret Keyword",
"verified_result": null
},
{
"hashed_secret": "055abb8b464ae0ab2bb7e9d2fa150c641fee8334",
"is_secret": false,
"is_verified": false,
"line_number": 377,
"line_number": 379,
"type": "Secret Keyword",
"verified_result": null
}
Expand Down
3 changes: 2 additions & 1 deletion deployment-scripts/create_buckets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@ def get_s3_client():
"geoserver",
"temp-upload",
"inference-auxdata",
"generic-python-processor"
"generic-python-processor",
"pipeline-data"
]


Expand Down
5 changes: 5 additions & 0 deletions deployment-scripts/template/env.template.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ export NON_COS_STORAGE_CLASS=
export PVC_ACCESS_MODE=ReadWriteOnce
export PIPELINES_V2_INFERENCE_ROOT_FOLDER_VALUE=

# Terrakit Cache Configuration
export TERRAKIT_CACHE_ENABLED_VALUE=true
export TERRAKIT_CACHE_DIR_VALUE=/pipeline/data/terrakit_cache

# Populate buckets with data
export LULC_TILE_ROOT=
export LULC_TILE_SHAPEFILE=
Expand Down Expand Up @@ -68,6 +72,7 @@ export BUCKET_GEOSERVER=${DEPLOYMENT_ENV}-geoserver
export BUCKET_TEMP_UPLOAD=${DEPLOYMENT_ENV}-temp-upload
export BUCKET_INFERENCE_AUXDATA=${DEPLOYMENT_ENV}-inference-auxdata
export BUCKET_GENERIC_PYTHON_PROCESSOR=${DEPLOYMENT_ENV}-generic-python-processor
export BUCKET_PIPELINE_DATA=${DEPLOYMENT_ENV}-pipeline-data


# GPU_CONFIG
Expand Down
3 changes: 3 additions & 0 deletions deployment-scripts/values-file-generate.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ do
-e "s|BUCKET_GFM_MLFLOW|${BUCKET_GFM_MLFLOW}|" \
-e "s|BUCKET_GEOSERVER|${BUCKET_GEOSERVER}|" \
-e "s|BUCKET_GENERIC_PYTHON_PROCESSOR|${BUCKET_GENERIC_PYTHON_PROCESSOR}|" \
-e "s|BUCKET_PIPELINE_DATA|${BUCKET_PIPELINE_DATA}|" \
-e "s|COS_STORAGE_CLASS|${COS_STORAGE_CLASS}|" \
-e "s|SHARE_PIPELINE_PVC|${SHARE_PIPELINE_PVC}|" \
-e "s|OAUTH_TYPE|${OAUTH_TYPE}|" \
Expand All @@ -62,5 +63,7 @@ do
-e "s|GEOSERVER_CM_PROXYBASEURL|${GEOSERVER_CM_PROXYBASEURL}|" \
-e "s|geospatial-studio|${CONTAINER_IMAGE_REPOSITORY}|" \
-e "s|PIPELINES_V2_INFERENCE_ROOT_FOLDER_VALUE|${PIPELINES_V2_INFERENCE_ROOT_FOLDER_VALUE}|" \
-e "s|TERRAKIT_CACHE_ENABLED_VALUE|${TERRAKIT_CACHE_ENABLED_VALUE}|" \
-e "s|TERRAKIT_CACHE_DIR_VALUE|${TERRAKIT_CACHE_DIR_VALUE}|" \
${HELM_CHART_NAME}/values.yaml > workspace/$DEPLOYMENT_ENV/values/${HELM_CHART_NAME}/values.yaml
done
3 changes: 3 additions & 0 deletions geospatial-studio/charts/geospatial-studio-pipelines/templates/secrets.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ data:
gfmaas_api_key: {{ .Values.gateway.api_key | b64enc }}
geoserver_username: {{ .Values.geoserver.username | b64enc }}
geoserver_password: {{ .Values.geoserver.password | b64enc }}
{{- if .Values.redis.enabled }}
REDIS_URL: {{ include "geospatial-studio.redis.url" . | b64enc | quote }}
{{- end }}

---
{{ if hasKey .Values "nasaEarthBearerToken"}}
Expand Down
14 changes: 14 additions & 0 deletions geospatial-studio/charts/geospatial-studio-pipelines/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ gateway:
api_key: studio_api_key
appName: geofm-gateway

redis:
enabled: REDIS_ENABLED

geoserver:
username: geoserver_username
password: geoserver_password
Expand Down Expand Up @@ -95,6 +98,7 @@ objectStorage:
geoserver: BUCKET_GEOSERVER
inference_auxdata: BUCKET_INFERENCE_AUXDATA
generic_python_processor: BUCKET_GENERIC_PYTHON_PROCESSOR
pipelineData: BUCKET_PIPELINE_DATA
cos_storage_class: COS_STORAGE_CLASS
non_cos_storage_class: NON_COS_STORAGE_CLASS
pvc_access_mode: PVC_ACCESS_MODE
Expand Down Expand Up @@ -154,6 +158,16 @@ processors:
secretKeyRef:
name: nasa-earth-data-secret
key: NASA_EARTH_BEARER_TOKEN
- name: TERRAKIT_CACHE_ENABLED
value: "TERRAKIT_CACHE_ENABLED_VALUE"
- name: TERRAKIT_CACHE_DIR
value: "TERRAKIT_CACHE_DIR_VALUE"
extra_volumes:
- name: pipeline-data-pvc
claimName: pipeline-data-pvc
bucket_name: BUCKET_PIPELINE_DATA
mountPath: /pipeline/data
create: true
- name: push-to-geoserver
enabled: true
image:
Expand Down
13 changes: 13 additions & 0 deletions geospatial-studio/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,8 @@ geospatial-studio-pipelines:
cluster_url: CLUSTER_URL
environment: ENVIRONMENT_VALUE
log_level: DEBUG
redis:
enalbed: REDIS_ENABLED
inference_volume:
pvc_name: inference-shared-pvc
default_replicas: 1
Expand Down Expand Up @@ -407,6 +409,7 @@ geospatial-studio-pipelines:
mlflow: BUCKET_GFM_MLFLOW
geoserver: BUCKET_GEOSERVER
inference_auxdata: BUCKET_INFERENCE_AUXDATA
pipelineData: BUCKET_PIPELINE_DATA
cos_storage_class: COS_STORAGE_CLASS
non_cos_storage_class: NON_COS_STORAGE_CLASS
pvc_access_mode: PVC_ACCESS_MODE
Expand Down Expand Up @@ -461,6 +464,16 @@ geospatial-studio-pipelines:
secretKeyRef:
name: nasa-earth-data-secret
key: NASA_EARTH_BEARER_TOKEN
- name: TERRAKIT_CACHE_ENABLED
value: "TERRAKIT_CACHE_ENABLED_VALUE"
- name: TERRAKIT_CACHE_DIR
value: "TERRAKIT_CACHE_DIR_VALUE"
extra_volumes:
- name: pipeline-data-pvc
claimName: pipeline-data-pvc
bucket_name: BUCKET_PIPELINE_DATA
mountPath: /pipeline/data
create: true
- name: push-to-geoserver
enabled: true
image:
Expand Down
Loading