Skip to content
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.

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

Feat/aws waf support #185

Merged
merged 1 commit into from
Jul 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 2 deletions helm/gen3/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ dependencies:
repository: "file://../requestor"
condition: requestor.enabled
- name: revproxy
version: 0.1.14
version: 0.1.15
repository: "file://../revproxy"
condition: revproxy.enabled
- name: sheepdog
Expand Down Expand Up @@ -128,7 +128,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.36
version: 0.1.37

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand Down
4 changes: 2 additions & 2 deletions helm/revproxy/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: 0.1.14
version: 0.1.15

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
Expand All @@ -25,5 +25,5 @@ appVersion: "master"

dependencies:
- name: common
version: 0.1.10
version: 0.1.11
repository: file://../common
3 changes: 3 additions & 0 deletions helm/revproxy/templates/ingress_aws.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@ metadata:
alb.ingress.kubernetes.io/listen-ports: '[{"HTTP": 80}, {"HTTPS":443}]'
alb.ingress.kubernetes.io/actions.ssl-redirect: '{"Type": "redirect", "RedirectConfig": { "Protocol": "HTTPS", "Port": "443", "StatusCode": "HTTP_301"}}'
alb.ingress.kubernetes.io/ssl-policy: ELBSecurityPolicy-TLS13-1-2-Res-FIPS-2023-04
{{- if .Values.global.aws.wafv2.enabled }}
alb.ingress.kubernetes.io/wafv2-acl-arn: {{ .Values.global.aws.wafv2.wafAclArn }}
{{- end }}
spec:
ingressClassName: alb
rules:
Expand Down
6 changes: 6 additions & 0 deletions helm/revproxy/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@ global:
awsAccessKeyId:
# -- (string) Credentials for AWS stuff.
awsSecretAccessKey:
# -- (map) WAF configuration
wafv2:
# -- (bool) Set to true if using AWS WAFv2
enabled: false
# -- (string) ARN for the WAFv2 ACL.
wafAclArn:
# -- (bool) Whether the deployment is for development purposes.
dev: true

Expand Down
Loading