diff --git a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml index 285715da..3ec0915f 100644 --- a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-deployment.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }} {{- if .Values.tilerServerCacheCleaner.enabled -}} apiVersion: apps/v1 diff --git a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-hpa.yaml b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-hpa.yaml index 556ccc23..d16323f8 100644 --- a/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-hpa.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-cache-cleaner-hpa.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }} {{- if .Values.tilerServerCacheCleaner.enabled -}} {{- if .Values.tilerServerCacheCleaner.autoscaling.enabled -}} diff --git a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml index 025bf7af..3ca467ce 100644 --- a/osm-seed/templates/tiler-server/tiler-server-configMap.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-configMap.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} apiVersion: v1 kind: ConfigMap metadata: diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml index b0a659b2..85dc951d 100644 --- a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "s3" }} apiVersion: apps/v1 kind: Deployment diff --git a/osm-seed/templates/tiler-server/tiler-server-dp.yaml b/osm-seed/templates/tiler-server/tiler-server-dp.yaml index 051f02c7..6654f7b9 100644 --- a/osm-seed/templates/tiler-server/tiler-server-dp.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-dp.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "file" }} {{- if .Values.tilerServer.persistenceDisk.enabled -}} apiVersion: v1 diff --git a/osm-seed/templates/tiler-server/tiler-server-hpa.yaml b/osm-seed/templates/tiler-server/tiler-server-hpa.yaml index 8ec755ba..08cfdfd2 100644 --- a/osm-seed/templates/tiler-server/tiler-server-hpa.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-hpa.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{- if .Values.tilerServer.autoscaling.enabled -}} apiVersion: autoscaling/v2 kind: HorizontalPodAutoscaler diff --git a/osm-seed/templates/tiler-server/tiler-server-ingress.yaml b/osm-seed/templates/tiler-server/tiler-server-ingress.yaml index e92a5949..bf544fde 100644 --- a/osm-seed/templates/tiler-server/tiler-server-ingress.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-ingress.yaml @@ -2,11 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: {{ template "osm-seed.fullname" . }}-ingress-tiler-server - annotations: - kubernetes.io/ingress.class: nginx - cert-manager.io/cluster-issuer: letsencrypt-prod-issuer - nginx.ingress.kubernetes.io/proxy-body-size: 5m + name: {{ .Release.Name }}-ingress-tiler-server annotations: kubernetes.io/ingress.class: nginx cert-manager.io/cluster-issuer: letsencrypt-prod-issuer @@ -17,22 +13,22 @@ metadata: spec: ingressClassName: nginx tls: - - hosts: - {{- if .Values.tilerServer.ingressDomain }} - - {{ .Values.tilerServer.ingressDomain }} - {{- else }} - - tiler.{{ .Values.domain }} - {{- end }} - secretName: {{ template "osm-seed.fullname" . }}-secret-tiler-server + - hosts: + {{- if .Values.tilerServer.ingressDomain }} + - {{ .Values.tilerServer.ingressDomain }} + {{- else }} + - tiler.{{ .Values.domain }} + {{- end }} + secretName: {{ .Release.Name }}-secret-tiler-server rules: - - host: {{ if .Values.tilerServer.ingressDomain }}{{ .Values.tilerServer.ingressDomain }}{{ else }}tiler.{{ .Values.domain }}{{ end }} - http: - paths: - - path: / - pathType: Prefix - backend: - service: - name: {{ template "osm-seed.fullname" . }}-tiler-server - port: - number: 80 -{{- end }} \ No newline at end of file + - host: {{ if .Values.tilerServer.ingressDomain }}{{ .Values.tilerServer.ingressDomain }}{{ else }}tiler.{{ .Values.domain }}{{ end }} + http: + paths: + - path: / + pathType: Prefix + backend: + service: + name: {{ .Release.Name }}-tiler-server + port: + number: 80 +{{- end }} diff --git a/osm-seed/templates/tiler-server/tiler-server-service.yaml b/osm-seed/templates/tiler-server/tiler-server-service.yaml index f8477ae9..0e318097 100644 --- a/osm-seed/templates/tiler-server/tiler-server-service.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-service.yaml @@ -1,8 +1,8 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if .Values.tilerServer.enabled }} apiVersion: v1 kind: Service metadata: - name: {{ template "osm-seed.fullname" . }}-tiler-server + name: {{ .Release.Name }}-tiler-server labels: app: {{ template "osm-seed.name" . }} component: tiler-server-service @@ -13,7 +13,7 @@ metadata: service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }} service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https - service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "600" + service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "600" {{- end }} {{- if eq .Values.serviceType "ClusterIP" }} kubernetes.io/ingress.class: nginx @@ -25,21 +25,37 @@ metadata: {{- toYaml . | nindent 4 }} {{- end }} spec: - type: {{ .Values.serviceType }} + # If tilerServer.externalService.enabled = true, we use ExternalName; otherwise use user-defined serviceType + type: {{- if .Values.tilerServer.externalService.enabled }} ExternalName {{- else }} {{ .Values.serviceType }} {{- end }} + + {{- if .Values.tilerServer.externalService.enabled }} + # external name service + externalName: "{{ .Values.tilerServer.externalService.ip }}" + ports: + - port: 80 + protocol: TCP + name: http + targetPort: {{ .Values.tilerServer.externalService.port }} + - port: 443 + protocol: TCP + name: https + targetPort: {{ .Values.tilerServer.externalService.port }} + {{- else }} + # normal (internal) service ports: - port: 80 targetPort: http protocol: TCP name: http - {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} + {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} - port: 443 targetPort: http protocol: TCP name: https - {{- end }} - + {{- end }} selector: app: {{ template "osm-seed.name" . }} release: {{ .Release.Name }} run: {{ .Release.Name }}-tiler-server -{{- end }} \ No newline at end of file + {{- end }} +{{- end }} diff --git a/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml b/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml index 80818bdb..1d0181ef 100644 --- a/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-statefulset.yaml @@ -1,4 +1,4 @@ -{{- if .Values.tilerServer.enabled -}} +{{- if and .Values.tilerServer.enabled (not .Values.tilerServer.externalService.enabled) }} {{ if eq .Values.tilerServer.env.TILER_CACHE_TYPE "file" }} apiVersion: apps/v1 kind: StatefulSet diff --git a/osm-seed/values.yaml b/osm-seed/values.yaml index 94c88241..9a38064b 100644 --- a/osm-seed/values.yaml +++ b/osm-seed/values.yaml @@ -464,6 +464,10 @@ tilerImposm: # ==================================================================================================== tilerServer: enabled: false + externalService: + enabled: true + ip: "37.1.1.5" + port: 9090 image: name: "" tag: ""