diff --git a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml index 6758552c..604b3515 100644 --- a/osm-seed/templates/tiler-server/tiler-server-deployment.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-deployment.yaml @@ -31,9 +31,6 @@ spec: - name: http containerPort: {{ .Values.tilerServer.env.TILER_SERVER_PORT }} protocol: TCP - - name: prometheus - containerPort: 9091 - protocol: TCP livenessProbe: httpGet: path: / diff --git a/osm-seed/templates/tiler-server/tiler-server-service.yaml b/osm-seed/templates/tiler-server/tiler-server-service.yaml index be6a8fa8..4ec5ba09 100644 --- a/osm-seed/templates/tiler-server/tiler-server-service.yaml +++ b/osm-seed/templates/tiler-server/tiler-server-service.yaml @@ -12,7 +12,7 @@ metadata: {{- if and (eq .Values.serviceType "LoadBalancer") .Values.AWS_SSL_ARN }} 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-ssl-ports: https {{- end }} {{- if eq .Values.serviceType "ClusterIP" }} kubernetes.io/ingress.class: nginx @@ -30,32 +30,13 @@ spec: 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 }} - selector: - app: {{ template "osm-seed.name" . }} - release: {{ .Release.Name }} - run: {{ .Release.Name }}-tiler-server ---- -apiVersion: v1 -kind: Service -metadata: - name: {{ .Release.Name }}-tiler-server-prometheus - labels: - app: {{ template "osm-seed.name" . }} - component: tiler-server-prometheus-service - release: {{ .Release.Name }} -spec: - type: {{ .Values.tilerServer.prometheus.serviceType | default "ClusterIP" }} - ports: - - name: prometheus - port: 9091 - targetPort: prometheus - protocol: TCP + {{- end }} + selector: app: {{ template "osm-seed.name" . }} release: {{ .Release.Name }}