diff --git a/charts/nominatim/Chart.yaml b/charts/nominatim/Chart.yaml index ff94814..3f1770b 100644 --- a/charts/nominatim/Chart.yaml +++ b/charts/nominatim/Chart.yaml @@ -15,7 +15,7 @@ type: application # This is the chart version. This version number should be incremented each time you make changes # to the chart and its templates, including the app version. # Versions are expected to follow Semantic Versioning (https://semver.org/) -version: 3.5.0 +version: 3.6.0 # This is the version number of the application being deployed. This version number should be # incremented each time you make changes to the application. Versions are not expected to @@ -31,3 +31,6 @@ dependencies: version: 11.6.20 repository: https://charts.bitnami.com/bitnami condition: postgresql.enabled + +annotations: + repository: robjuz/helm-charts diff --git a/charts/nominatim/templates/_helpers.tpl b/charts/nominatim/templates/_helpers.tpl index dfec850..4af8b46 100644 --- a/charts/nominatim/templates/_helpers.tpl +++ b/charts/nominatim/templates/_helpers.tpl @@ -128,3 +128,10 @@ pgsql:host={{ include "nominatim.databaseHost" . }};port={{ include "nominatim.d {{- define "nominatim.uiUrl" -}} {{- printf "https://github.com/osm-search/nominatim-ui/releases/download/v%s/nominatim-ui-%s.tar.gz" .Values.nominatimUi.version .Values.nominatimUi.version }} {{- end }} + +{{/* +Create user agent string for curl +*/}} +{{- define "chart.userAgent" -}} +{{- printf "%s/%s:%s" .Chart.Annotations.Repository .Chart.Name .Chart.Version }} +{{- end }} diff --git a/charts/nominatim/templates/initJob.yaml b/charts/nominatim/templates/initJob.yaml index 5231c09..94f064b 100644 --- a/charts/nominatim/templates/initJob.yaml +++ b/charts/nominatim/templates/initJob.yaml @@ -25,8 +25,10 @@ spec: name: data command: - curl + - -A {{ include "chart.userAgent" . }} - {{ .Values.nominatimInitialize.customStyleUrl }} - -L + - -f - -o - custom.style {{- end }} @@ -40,8 +42,10 @@ spec: name: data command: - curl + - -A {{ include "chart.userAgent" . }} - {{ .Values.nominatimInitialize.wikipediaUrl }} - -L + - -f - -o - wikimedia-importance.sql.gz {{- end }} @@ -55,8 +59,10 @@ spec: name: data command: - curl + - -A {{ include "chart.userAgent" . }} - https://www.nominatim.org/data/gb_postcodes.csv.gz - -L + - -f - -o - gb_postcodes.csv.gz {{- end }} @@ -70,8 +76,10 @@ spec: name: data command: - curl + - -A {{ include "chart.userAgent" . }} - https://www.nominatim.org/data/us_postcodes.csv.gz - -L + - -f - -o - us_postcodes.csv.gz {{- end }} @@ -84,9 +92,11 @@ spec: name: data command: - curl - - -L + - -A {{ include "chart.userAgent" . }} - {{ .Values.nominatimInitialize.pbfUrl }} - --create-dirs + - -L + - -f - -o - data.osm.pbf