Skip to content

set proper memory limits for martin #414

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

Merged
michaelkirk merged 2 commits into from
Jun 5, 2026
Merged

set proper memory limits for martin #414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2cf5120
set proper memory limits for martin
michaelkirk Jun 3, 2026
5b1bd37
update dagger for github
michaelkirk Jun 3, 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
4 changes: 2 additions & 2 deletions .github/workflows/checks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install Dagger
uses: dagger/dagger-for-github@v8.2.0
uses: dagger/dagger-for-github@v8.4.0
with:
version: "latest"
- name: Copy .bin-env
Expand All @@ -35,7 +35,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install Dagger
uses: dagger/dagger-for-github@v8.2.0
uses: dagger/dagger-for-github@v8.4.0
with:
version: "latest"
- name: Build service images
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-dev-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install Dagger
uses: dagger/dagger-for-github@v8.2.0
uses: dagger/dagger-for-github@v8.4.0
with:
version: "latest"
- name: Docker login
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/push-latest-containers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
steps:
- uses: actions/checkout@v6
- name: Install Dagger
uses: dagger/dagger-for-github@v8.2.0
uses: dagger/dagger-for-github@v8.4.0
with:
version: "latest"
- name: Docker login
Expand Down
14 changes: 10 additions & 4 deletions bin/k8s-generate
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,14 +36,21 @@ export HEADWAY_DATA_TAG
export HEADWAY_CONTAINER_TAG="${HEADWAY_CONTAINER_TAG:-latest}"

source bin/_source-env.sh "$CONFIG_DIR"
set -a
source ".bin-env"
set +a

EXISTING_DEPLOYMENT_CONFIG="${OUTPUT_DIR}/deployment-config.yaml"
PELIAS_CONFIG_FILE="data/${HEADWAY_AREA}/${HEADWAY_AREA}.pelias.json"
if [ ! -f "$PELIAS_CONFIG_FILE" ]; then
echo "Missing pelias config file: ${PELIAS_CONFIG_FILE}"
if [ -f "$PELIAS_CONFIG_FILE" ]; then
PELIAS_CONFIG_JSON=$(cat $PELIAS_CONFIG_FILE)
elif [ -f "$EXISTING_DEPLOYMENT_CONFIG" ]; then
echo "Warning: ${PELIAS_CONFIG_FILE} not found; extracting pelias config from existing ${EXISTING_DEPLOYMENT_CONFIG}"
PELIAS_CONFIG_JSON=$(python3 -c "import yaml, sys; d=yaml.safe_load(sys.stdin); print(d['data']['pelias-config-json'], end='')" < "$EXISTING_DEPLOYMENT_CONFIG")
else
echo "Missing pelias config file: ${PELIAS_CONFIG_FILE} and no existing rendered output to fall back on"
exit 1
fi
PELIAS_CONFIG_JSON=$(cat $PELIAS_CONFIG_FILE)

indent4() { while IFS= read -r line; do printf ' %s\n' "$line"; done; }
export PELIAS_CONFIG_JSON_YAML="|
Expand Down Expand Up @@ -128,4 +135,3 @@ do
render_template $file
done


4 changes: 2 additions & 2 deletions k8s/_template/tileserver-deployment.yaml.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ spec:
value: "8000"
resources:
limits:
memory: 500Mi
memory: 1500Mi
requests:
memory: 200Mi
memory: 250Mi
livenessProbe:
httpGet:
path: /
Expand Down
4 changes: 2 additions & 2 deletions k8s/configs/planet-dev/tileserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ spec:
value: "8000"
resources:
limits:
memory: 500Mi
memory: 1500Mi
requests:
memory: 200Mi
memory: 250Mi
livenessProbe:
httpGet:
path: /
Expand Down
4 changes: 2 additions & 2 deletions k8s/configs/planet/tileserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ spec:
value: "8000"
resources:
limits:
memory: 500Mi
memory: 1500Mi
requests:
memory: 200Mi
memory: 250Mi
livenessProbe:
httpGet:
path: /
Expand Down
4 changes: 2 additions & 2 deletions k8s/configs/seattle-dev/tileserver-deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,9 +60,9 @@ spec:
value: "8000"
resources:
limits:
memory: 500Mi
memory: 1500Mi
requests:
memory: 200Mi
memory: 250Mi
livenessProbe:
httpGet:
path: /
Expand Down
1 change: 1 addition & 0 deletions services/tileserver/martin-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cache_size_mb: 1024
pmtiles:
sources:
areamap: /data/tiles/areamap.pmtiles
Expand Down
1 change: 1 addition & 0 deletions services/tileserver/martin-dev-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
cache_size_mb: 1024
pmtiles:
sources:
areamap: ../../data/Bogota/Bogota.pmtiles
Expand Down
Loading