Skip to content

Commit dd9c540

Browse files
Rub21Rub21
authoredMar 12, 2025··
Config to use external tiler server (#358)
* Update tiler config for external service * Update values
1 parent 4b03235 commit dd9c540

10 files changed

+54
-38
lines changed
 

‎osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }}
33
{{- if .Values.tilerServerCacheCleaner.enabled -}}
44
apiVersion: apps/v1

‎osm-seed/templates/tiler-server/tiler-server-cache-cleaner-hpa.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }}
33
{{- if .Values.tilerServerCacheCleaner.enabled -}}
44
{{- if .Values.tilerServerCacheCleaner.autoscaling.enabled -}}

‎osm-seed/templates/tiler-server/tiler-server-configMap.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
apiVersion: v1
33
kind: ConfigMap
44
metadata:

‎osm-seed/templates/tiler-server/tiler-server-deployment.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }}
33
apiVersion: apps/v1
44
kind: Deployment

‎osm-seed/templates/tiler-server/tiler-server-dp.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "file" }}
33
{{- if .Values.tilerServer.persistenceDisk.enabled -}}
44
apiVersion: v1

‎osm-seed/templates/tiler-server/tiler-server-hpa.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{- if .Values.tilerServer.autoscaling.enabled -}}
33
apiVersion: autoscaling/v2
44
kind: HorizontalPodAutoscaler

‎osm-seed/templates/tiler-server/tiler-server-ingress.yaml

+19-23
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
apiVersion: networking.k8s.io/v1
33
kind: Ingress
44
metadata:
5-
name: {{ template "osm-seed.fullname" . }}-ingress-tiler-server
6-
annotations:
7-
kubernetes.io/ingress.class: nginx
8-
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
9-
nginx.ingress.kubernetes.io/proxy-body-size: 5m
5+
name: {{ .Release.Name }}-ingress-tiler-server
106
annotations:
117
kubernetes.io/ingress.class: nginx
128
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
@@ -17,22 +13,22 @@ metadata:
1713
spec:
1814
ingressClassName: nginx
1915
tls:
20-
- hosts:
21-
{{- if .Values.tilerServer.ingressDomain }}
22-
- {{ .Values.tilerServer.ingressDomain }}
23-
{{- else }}
24-
- tiler.{{ .Values.domain }}
25-
{{- end }}
26-
secretName: {{ template "osm-seed.fullname" . }}-secret-tiler-server
16+
- hosts:
17+
{{- if .Values.tilerServer.ingressDomain }}
18+
- {{ .Values.tilerServer.ingressDomain }}
19+
{{- else }}
20+
- tiler.{{ .Values.domain }}
21+
{{- end }}
22+
secretName: {{ .Release.Name }}-secret-tiler-server
2723
rules:
28-
- host: {{ if .Values.tilerServer.ingressDomain }}{{ .Values.tilerServer.ingressDomain }}{{ else }}tiler.{{ .Values.domain }}{{ end }}
29-
http:
30-
paths:
31-
- path: /
32-
pathType: Prefix
33-
backend:
34-
service:
35-
name: {{ template "osm-seed.fullname" . }}-tiler-server
36-
port:
37-
number: 80
38-
{{- end }}
24+
- host: {{ if .Values.tilerServer.ingressDomain }}{{ .Values.tilerServer.ingressDomain }}{{ else }}tiler.{{ .Values.domain }}{{ end }}
25+
http:
26+
paths:
27+
- path: /
28+
pathType: Prefix
29+
backend:
30+
service:
31+
name: {{ .Release.Name }}-tiler-server
32+
port:
33+
number: 80
34+
{{- end }}

‎osm-seed/templates/tiler-server/tiler-server-service.yaml

+24-8
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if .Values.tilerServer.enabled }}
22
apiVersion: v1
33
kind: Service
44
metadata:
5-
name: {{ template "osm-seed.fullname" . }}-tiler-server
5+
name: {{ .Release.Name }}-tiler-server
66
labels:
77
app: {{ template "osm-seed.name" . }}
88
component: tiler-server-service
@@ -13,7 +13,7 @@ metadata:
1313
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }}
1414
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
1515
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
16-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "600"
16+
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "600"
1717
{{- end }}
1818
{{- if eq .Values.serviceType "ClusterIP" }}
1919
kubernetes.io/ingress.class: nginx
@@ -25,21 +25,37 @@ metadata:
2525
{{- toYaml . | nindent 4 }}
2626
{{- end }}
2727
spec:
28-
type: {{ .Values.serviceType }}
28+
# If tilerServer.externalService.enabled = true, we use ExternalName; otherwise use user-defined serviceType
29+
type: {{- if .Values.tilerServer.externalService.enabled }} ExternalName {{- else }} {{ .Values.serviceType }} {{- end }}
30+
31+
{{- if .Values.tilerServer.externalService.enabled }}
32+
# external name service
33+
externalName: "{{ .Values.tilerServer.externalService.ip }}"
34+
ports:
35+
- port: 80
36+
protocol: TCP
37+
name: http
38+
targetPort: {{ .Values.tilerServer.externalService.port }}
39+
- port: 443
40+
protocol: TCP
41+
name: https
42+
targetPort: {{ .Values.tilerServer.externalService.port }}
43+
{{- else }}
44+
# normal (internal) service
2945
ports:
3046
- port: 80
3147
targetPort: http
3248
protocol: TCP
3349
name: http
34-
{{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
50+
{{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
3551
- port: 443
3652
targetPort: http
3753
protocol: TCP
3854
name: https
39-
{{- end }}
40-
55+
{{- end }}
4156
selector:
4257
app: {{ template "osm-seed.name" . }}
4358
release: {{ .Release.Name }}
4459
run: {{ .Release.Name }}-tiler-server
45-
{{- end }}
60+
{{- end }}
61+
{{- end }}

‎osm-seed/templates/tiler-server/tiler-server-statefulset.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
{{- if .Values.tilerServer.enabled -}}
1+
{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }}
22
{{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "file" }}
33
apiVersion: apps/v1
44
kind: StatefulSet

‎osm-seed/values.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -464,6 +464,10 @@ tilerImposm:
464464
# ====================================================================================================
465465
tilerServer:
466466
enabled: false
467+
externalService:
468+
enabled: true
469+
ip: "37.1.1.5"
470+
port: 9090
467471
image:
468472
name: ""
469473
tag: ""

0 commit comments

Comments
 (0)
Please sign in to comment.