Update configs

Author: Rub21

osm-seed/templates/cgimap/cgimap-service.yaml

@@ -9,18 +9,12 @@ metadata:
     environment: {{ .Values.environment }}
     release: {{ .Release.Name }}
   annotations:
-    {{- 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    
-    {{- end }}
-    {{- if eq .Values.serviceType "ClusterIP" }}
+    # NLB
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
+    service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
+    service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
+    service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
-    {{- else }}
-    fake.annotation: fake
-    {{- end }}
-    {{- with .Values.cgimap.serviceAnnotations }}
-    {{- toYaml . | nindent 4 }}
     {{- end }}
 spec:
   type: {{ .Values.serviceType }}

osm-seed/templates/nominatim-api/nominatim-service.yaml

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

osm-seed/templates/osmcha-app/service.yaml

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

osm-seed/templates/overpass-api/overpass-api-service.yaml

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

osm-seed/templates/taginfo/taginfo-service.yaml

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

osm-seed/templates/tasking-manager-api/tm-service.yaml

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

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

@@ -10,13 +10,10 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
 spec:

osm-seed/templates/web/web-service.yaml

@@ -10,15 +10,13 @@ metadata:
     release: {{ .Release.Name }}
   annotations:
     # NLB
-    {{- if eq .Values.ingressClassNameType "nlb" }}
+    {{- if and  (eq .Values.ingressClassNameType "nlb" ) (eq .Values.serviceType "ClusterIP") }}
     service.beta.kubernetes.io/aws-load-balancer-type: "nlb"
     service.beta.kubernetes.io/aws-load-balancer-nlb-target-type: "ip"
     service.beta.kubernetes.io/aws-load-balancer-connection-idle-timeout: "300"
-    {{- end }}
-    # ClusterIP
-    {{- if eq .Values.serviceType "ClusterIP" }}
     cert-manager.io/cluster-issuer: {{ .Release.Name }}-letsencrypt-prod-issuer
     {{- end }}
+
 spec:
   type: {{ .Values.serviceType }}
   selector: