From ba062bb6380f19ff02cdfddbf3dc1d92e1b73583 Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2024 10:30:56 -0700 Subject: [PATCH 1/2] bump planet version --- builds/planet/env.sh | 2 +- k8s/configs/planet-dev/deployment-config.yaml | 14 +++++++------- .../opentripplanner-barcelona-config.yaml | 2 +- .../opentripplanner-losangeles-config.yaml | 2 +- .../opentripplanner-pugetsound-config.yaml | 2 +- k8s/configs/planet/deployment-config.yaml | 14 +++++++------- .../planet/opentripplanner-barcelona-config.yaml | 2 +- .../planet/opentripplanner-losangeles-config.yaml | 2 +- .../planet/opentripplanner-pugetsound-config.yaml | 2 +- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/builds/planet/env.sh b/builds/planet/env.sh index 3092cab4b..09340dde7 100644 --- a/builds/planet/env.sh +++ b/builds/planet/env.sh @@ -1,4 +1,4 @@ -export HEADWAY_PLANET_VERSION=v1.42 +export HEADWAY_PLANET_VERSION=v1.43 export HEADWAY_AREA=maps-earth-planet-${HEADWAY_PLANET_VERSION} export HEADWAY_AREA_TAG="$HEADWAY_AREA" export HEADWAY_COUNTRIES="ALL" diff --git a/k8s/configs/planet-dev/deployment-config.yaml b/k8s/configs/planet-dev/deployment-config.yaml index 3cc57282e..8e4660a1e 100644 --- a/k8s/configs/planet-dev/deployment-config.yaml +++ b/k8s/configs/planet-dev/deployment-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: deployment-config data: - area: maps-earth-planet-v1.42 + area: maps-earth-planet-v1.43 public-url: https://maps.earth bbox: "" enable-transit-routing: "1" @@ -11,12 +11,12 @@ data: www-about-link-text: "About maps.earth" www-contact-url: "mailto:info@maps.earth?subject=Hello,%20Earth" www-contact-link-text: "Contact Us" - terrain-source-url: https://data.example.com/0.8.0/terrain.mbtiles - landcover-source-url: https://data.example.com/0.8.0/landcover.mbtiles - areamap-source-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.mbtiles - valhalla-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.valhalla.tar.zst - placeholder-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.placeholder.tar.zst - elasticsearch-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.elasticsearch.tar.zst + terrain-source-url: https://data.example.com/0.9.0/terrain.mbtiles + landcover-source-url: https://data.example.com/0.9.0/landcover.mbtiles + areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.mbtiles + valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.valhalla.tar.zst + placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.placeholder.tar.zst + elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.elasticsearch.tar.zst pelias-config-json: | { "logger": { diff --git a/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml b/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml index 2efec43ba..570a4c4a7 100644 --- a/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-barcelona-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-barcelona-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/Barcelona.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/Barcelona.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml b/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml index 054165e60..9e435c692 100644 --- a/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-losangeles-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-losangeles-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/LosAngeles.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/LosAngeles.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml b/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml index 4da82fa9c..dbe091ab9 100644 --- a/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml +++ b/k8s/configs/planet-dev/opentripplanner-pugetsound-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: otp-pugetsound-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/PugetSound.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/PugetSound.graph.obj.zst router-config-json: | { "configVersion": "2023-05-24", diff --git a/k8s/configs/planet/deployment-config.yaml b/k8s/configs/planet/deployment-config.yaml index 3cc57282e..8e4660a1e 100644 --- a/k8s/configs/planet/deployment-config.yaml +++ b/k8s/configs/planet/deployment-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: deployment-config data: - area: maps-earth-planet-v1.42 + area: maps-earth-planet-v1.43 public-url: https://maps.earth bbox: "" enable-transit-routing: "1" @@ -11,12 +11,12 @@ data: www-about-link-text: "About maps.earth" www-contact-url: "mailto:info@maps.earth?subject=Hello,%20Earth" www-contact-link-text: "Contact Us" - terrain-source-url: https://data.example.com/0.8.0/terrain.mbtiles - landcover-source-url: https://data.example.com/0.8.0/landcover.mbtiles - areamap-source-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.mbtiles - valhalla-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.valhalla.tar.zst - placeholder-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.placeholder.tar.zst - elasticsearch-artifact-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/maps-earth-planet-v1.42.elasticsearch.tar.zst + terrain-source-url: https://data.example.com/0.9.0/terrain.mbtiles + landcover-source-url: https://data.example.com/0.9.0/landcover.mbtiles + areamap-source-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.mbtiles + valhalla-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.valhalla.tar.zst + placeholder-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.placeholder.tar.zst + elasticsearch-artifact-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/maps-earth-planet-v1.43.elasticsearch.tar.zst pelias-config-json: | { "logger": { diff --git a/k8s/configs/planet/opentripplanner-barcelona-config.yaml b/k8s/configs/planet/opentripplanner-barcelona-config.yaml index 2efec43ba..570a4c4a7 100644 --- a/k8s/configs/planet/opentripplanner-barcelona-config.yaml +++ b/k8s/configs/planet/opentripplanner-barcelona-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-barcelona-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/Barcelona.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/Barcelona.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet/opentripplanner-losangeles-config.yaml b/k8s/configs/planet/opentripplanner-losangeles-config.yaml index 054165e60..9e435c692 100644 --- a/k8s/configs/planet/opentripplanner-losangeles-config.yaml +++ b/k8s/configs/planet/opentripplanner-losangeles-config.yaml @@ -3,6 +3,6 @@ kind: ConfigMap metadata: name: otp-losangeles-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/LosAngeles.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/LosAngeles.graph.obj.zst router-config-json: "" diff --git a/k8s/configs/planet/opentripplanner-pugetsound-config.yaml b/k8s/configs/planet/opentripplanner-pugetsound-config.yaml index be626a57a..eb92d9fe5 100644 --- a/k8s/configs/planet/opentripplanner-pugetsound-config.yaml +++ b/k8s/configs/planet/opentripplanner-pugetsound-config.yaml @@ -3,7 +3,7 @@ kind: ConfigMap metadata: name: otp-pugetsound-config data: - graph-url: https://data.example.com/0.8.0/maps-earth-planet-v1.42/PugetSound.graph.obj.zst + graph-url: https://data.example.com/0.9.0/maps-earth-planet-v1.43/PugetSound.graph.obj.zst router-config-json: | { "updaters": [ From 02cc556fe01fe4cd81ef6f54cfa61b475475440e Mon Sep 17 00:00:00 2001 From: Michael Kirk Date: Wed, 3 Apr 2024 10:39:26 -0700 Subject: [PATCH 2/2] update opentripplanner --- Earthfile | 4 +--- bin/_headway_version.sh | 6 +++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Earthfile b/Earthfile index 69c6cf787..2eca94162 100644 --- a/Earthfile +++ b/Earthfile @@ -507,9 +507,7 @@ gtfs-build: ############################## otp-base: - # The version tag is ignored when sha256 is specified, but I'm leaving it - # in to document which "release" our sha pins to. - FROM opentripplanner/opentripplanner:2.3.0@sha256:630779e4b595462502b3813c1d6141da3e180d266d4a26371cc4ab6cb3390db0 + FROM opentripplanner/opentripplanner:2.5.0 RUN mkdir /var/opentripplanner diff --git a/bin/_headway_version.sh b/bin/_headway_version.sh index 577d5db9f..482d6caf6 100644 --- a/bin/_headway_version.sh +++ b/bin/_headway_version.sh @@ -21,10 +21,14 @@ # A bump in the DATA tag pretty much always implies a bump in the CONTAINER # tag, but not necessarily vice-versa. -export HEADWAY_DATA_TAG=0.8.0 +export HEADWAY_DATA_TAG=0.9.0 # # Schema change Log # +# ## DATA v0.9.0, CONTAINER v0.11.0 +# +# BREAKING DATA/CONTAINER: Updated OTP to 2.5.0 +# # ## DATA v0.8.0, CONTAINER v0.10.0 # # BREAKING DATA: pelias is now on es8