Skip to content

Commit b1bc774

Browse files
authored
Set up WAF Web-acl (#376)
* Add env vars for wikipedia-wikiledia * Add configuration to support a custom ingressClassName * Add configuration to support a custom ingressClassName - overpass-api * Set gitsha for taginfo image * Rename ClusterIssuer and point to ingressClassName * Set global ingressClassName value * Support ALB for web service * Update ingress and service config to support aws ALB * Set annotations for ingress * Use ClusterIssuer only if it is NLB * Update configs * Add healthcheck-path for services - alb * Anable waf ACL
1 parent c0a4ef2 commit b1bc774

File tree

7 files changed

+28
-2
lines changed

7 files changed

+28
-2
lines changed

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
# Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
# Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
# Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
# Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
# Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,10 @@ metadata:
2222
alb.ingress.kubernetes.io/listen-ports: '{{ .Values.alb.listenPorts | default "[{\"HTTP\":80},{\"HTTPS\":443}]" }}'
2323
alb.ingress.kubernetes.io/certificate-arn: "{{ .Values.alb.certificateArn }}"
2424
alb.ingress.kubernetes.io/ssl-redirect: '443'
25+
## Enable WAF
26+
{{- if .Values.alb.enableWaf.enabled }}
27+
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
28+
{{- end }}
2529
{{- end }}
2630
spec:
2731
ingressClassName: {{ .Values.ingressClassName }}

osm-seed/values.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@ createClusterIssuer: false
4646
ingressClassNameType: "alb" #Type can be alb or nlb
4747
ingressClassName: alb #nginx, nginx-nlb, alb
4848
alb:
49-
certificateArn: "arn:aws:acm:us-east-1:618380242247:certificate/498e3dc0-843b-4c98-8d41-861775806e86"
50-
49+
certificateArn: "arn:aws:acm:us-east-1:1234567890:certificate/abcdeffff-843b-4c98-8d41-abcdeffff"
50+
enableWaf:
51+
enabled: false
52+
wafAclArn: arn:aws:wafv2:us-east-1:123456789:regional/webacl/webacl-alb/abcdeffff-ddddd-ddddd-bbbb-abcdeffff
5153
# Domain that is pointed to the clusterIP
5254
# You will need to create an A record like *.osmseed.example.com pointed to the ClusterIP
5355
# Then, the cluster configuration will setup services at their respective subdomains:

0 commit comments

Comments
 (0)