Skip to content

Commit 960ea1d

Browse files
committed
add ssl + ingress for tiler-visor
1 parent 52d99e9 commit 960ea1d

File tree

2 files changed

+46
-17
lines changed

2 files changed

+46
-17
lines changed
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
{{- if and .Values.tilerVisor.enabled (eq .Values.serviceType "ClusterIP") }}
2+
apiVersion: networking.k8s.io/v1
3+
kind: Ingress
4+
metadata:
5+
name: {{ template "osm-seed.fullname" . }}-ingress-tiler-visor
6+
annotations:
7+
kubernetes.io/ingress.class: nginx
8+
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
9+
spec:
10+
tls:
11+
- hosts:
12+
- tiler-visor.{{ .Values.domain }}
13+
secretName: {{ template "osm-seed.fullname" . }}-secret-tiler-visor
14+
15+
rules:
16+
- host: tiler-visor.{{ .Values.domain }}
17+
http:
18+
paths:
19+
- path: /
20+
pathType: Prefix
21+
backend:
22+
service:
23+
name: {{ template "osm-seed.fullname" . }}-tiler-visor
24+
port:
25+
number: 80
26+
{{- end }}

osm-seed/templates/tiler-visor/tiler-visor-service.yaml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,28 +8,31 @@ metadata:
88
component: tiler-visor-service
99
environment: {{ .Values.environment }}
1010
release: {{ .Release.Name }}
11-
{{- if eq .Values.cloudProvider "aws" }}
1211
annotations:
13-
service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
14-
{{- end }}
12+
{{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
13+
service.beta.kubernetes.io/aws-load-balancer-ssl-cert: {{ .Values.AWS_SSL_ARN }}
14+
service.beta.kubernetes.io/aws-load-balancer-backend-protocol: http
15+
service.beta.kubernetes.io/aws-load-balancer-ssl-ports: https
16+
{{- end }}
17+
{{- if eq .Values.serviceType "ClusterIP" }}
18+
kubernetes.io/ingress.class: nginx
19+
cert-manager.io/cluster-issuer: letsencrypt-prod-issuer
20+
{{- else }}
21+
fake.annotation: fake
22+
{{- end }}
1523
spec:
16-
# In case cloudProvider=aws
17-
{{- if eq .Values.cloudProvider "aws" }}
18-
type: LoadBalancer
19-
{{- end }}
20-
# In case cloudProvider=gcp
21-
{{- if eq .Values.cloudProvider "gcp" }}
22-
type: LoadBalancer
23-
{{- end }}
24-
# In case cloudProvider=minikube
25-
{{- if eq .Values.cloudProvider "minikube" }}
26-
type: NodePort
27-
{{- end }}
24+
type: {{ .Values.serviceType }}
2825
ports:
29-
- port: {{ .Values.tilerVisor.env.TILER_VISOR_PORT }}
30-
targetPort: 80
26+
- port: 80
27+
targetPort: http
3128
protocol: TCP
3229
name: http
30+
{{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }}
31+
- port: 443
32+
targetPort: http
33+
protocol: TCP
34+
name: https
35+
{{- end }}
3336
selector:
3437
app: {{ template "osm-seed.name" . }}
3538
release: {{ .Release.Name }}

0 commit comments

Comments
 (0)