Set annotations for ingress

Author: Rub21

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip" 
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

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

@@ -17,8 +17,8 @@ metadata:
     {{- if eq .Values.ingressClassNameType "alb" }}
     kubernetes.io/ingress.class: alb
     alb.ingress.kubernetes.io/group.name: {{ .Release.Name }}
-    alb.ingress.kubernetes.io/scheme: {{ .Values.alb.scheme | default "internet-facing" }}
-    alb.ingress.kubernetes.io/target-type: {{ .Values.alb.targetType | default "ip" }}
+    alb.ingress.kubernetes.io/scheme: "internet-facing"
+    alb.ingress.kubernetes.io/target-type: "ip"
     alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
     alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
     alb.ingress.kubernetes.io/ssl-redirect: '443'

osm-seed/values.yaml

@@ -42,7 +42,12 @@ AWS_SSL_ARN: false
 # serviceType: NodePort
 serviceType: ClusterIP
 createClusterIssuer: false
-ingressClassName: nginx-nlb
+## ALB configuration
+ingressClassNameType: "alb" #Type can be alb or nlb
+ingressClassName: alb #nginx,  nginx-nlb, alb
+alb:
+  certificateArn: "arn:aws:acm:us-east-1:618380242247:certificate/498e3dc0-843b-4c98-8d41-861775806e86"
+
 # Domain that is pointed to the clusterIP
 # You will need to create an A record like *.osmseed.example.com pointed to the ClusterIP
 # Then, the cluster configuration will setup services at their respective subdomains: