Skip to content

Set up WAF Web-acl #376

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Oct 16, 2025
Merged

Set up WAF Web-acl #376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
6e8c826
Add env vars for wikipedia-wikiledia
Rub21 Sep 15, 2025
3cd1652
Add configuration to support a custom ingressClassName
Rub21 Oct 3, 2025
48f14a2
Add configuration to support a custom ingressClassName - overpass-api
Rub21 Oct 3, 2025
bd1db08
Set gitsha for taginfo image
Rub21 Oct 3, 2025
df15c35
Rename ClusterIssuer and point to ingressClassName
Rub21 Oct 3, 2025
fba7033
Set global ingressClassName value
Rub21 Oct 3, 2025
a351757
Support ALB for web service
Rub21 Oct 7, 2025
debbcfe
Update ingress and service config to support aws ALB
Rub21 Oct 7, 2025
3609a4b
Set annotations for ingress
Rub21 Oct 7, 2025
053aa13
Use ClusterIssuer only if it is NLB
Rub21 Oct 7, 2025
ab9b3c2
Update configs
Rub21 Oct 7, 2025
697bb28
Add healthcheck-path for services - alb
Rub21 Oct 8, 2025
1f2e99b
Anable waf ACL
Rub21 Oct 15, 2025
46f4b5f
Merge from develop
Rub21 Oct 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions osm-seed/templates/nominatim-api/nominatim-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
# Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
4 changes: 4 additions & 0 deletions osm-seed/templates/overpass-api/overpass-api-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
# Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
4 changes: 4 additions & 0 deletions osm-seed/templates/taginfo/taginfo-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
# Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
4 changes: 4 additions & 0 deletions osm-seed/templates/tasking-manager-api/tm-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
# Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
4 changes: 4 additions & 0 deletions osm-seed/templates/tiler-server/tiler-server-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
# Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
4 changes: 4 additions & 0 deletions osm-seed/templates/web/web-ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ metadata:
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'
## Enable WAF
{{- if .Values.alb.enableWaf.enabled }}
alb.ingress.kubernetes.io/waf-acl-arn: "{{ .Values.alb.enableWaf.wafAclArn }}"
{{- end }}
{{- end }}
spec:
ingressClassName: {{ .Values.ingressClassName }}
Expand Down
6 changes: 4 additions & 2 deletions osm-seed/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,10 @@ createClusterIssuer: false
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"

certificateArn: "arn:aws:acm:us-east-1:1234567890:certificate/abcdeffff-843b-4c98-8d41-abcdeffff"
enableWaf:
enabled: false
wafAclArn: arn:aws:wafv2:us-east-1:123456789:regional/webacl/webacl-alb/abcdeffff-ddddd-ddddd-bbbb-abcdeffff
# 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:
Expand Down
Loading