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.

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

chore: add LB_DNS env var for internal ALBs #5483

Merged
merged 8 commits into from
Dec 1, 2023
Merged

chore: add LB_DNS env var for internal ALBs #5483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e8d65e8
chore: add LB_DNS env var for internal ALBs
huanjani Nov 15, 2023
13b636e
chore: add to integ tests
huanjani Nov 15, 2023
72f2863
chore: change to internal
huanjani Nov 15, 2023
778b3da
fix: differentiate alb types
huanjani Nov 15, 2023
af82e1b
chore: try without
huanjani Nov 15, 2023
aaac99c
chore: try with
huanjani Nov 15, 2023
54dee37
fix: finally get it...maybe
huanjani Nov 15, 2023
32ff31e
Merge branch 'mainline' into lbdns-for-be-env-var
mergify[bot] Dec 1, 2023
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
2 changes: 2 additions & 0 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-autoscaling-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ Resources:
Value: !Sub "${EnvName}"
- Name: COPILOT_SERVICE_NAME
Value: !Sub "${WorkloadName}"
- Name: COPILOT_LB_DNS
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
EnvironmentFiles:
- !If
- HasEnvFile
Expand Down
4 changes: 4 additions & 0 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-full-config-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,8 @@ Resources:
Value: !Sub "${EnvName}"
- Name: COPILOT_SERVICE_NAME
Value: !Sub "${WorkloadName}"
- Name: COPILOT_LB_DNS
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
EnvironmentFiles:
- !If
- HasEnvFile
Expand Down Expand Up @@ -119,6 +121,8 @@ Resources:
Value: !Sub "${EnvName}"
- Name: COPILOT_SERVICE_NAME
Value: !Sub "${WorkloadName}"
- Name: COPILOT_LB_DNS
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
EnvironmentFiles:
- !If
- HasEnvFileForfluentbit
Expand Down
2 changes: 2 additions & 0 deletions ...al/pkg/deploy/cloudformation/stack/testdata/workloads/backend/http-only-path-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,8 @@ Resources:
Value: !Sub "${EnvName}"
- Name: COPILOT_SERVICE_NAME
Value: !Sub "${WorkloadName}"
- Name: COPILOT_LB_DNS
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
EnvironmentFiles:
- !If
- HasEnvFile
Expand Down
2 changes: 2 additions & 0 deletions .../pkg/deploy/cloudformation/stack/testdata/workloads/backend/https-path-alias-template.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,8 @@ Resources:
Value: !Sub '${EnvName}'
- Name: COPILOT_SERVICE_NAME
Value: !Sub '${WorkloadName}'
- Name: COPILOT_LB_DNS
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
EnvironmentFiles:
- !If
- HasEnvFile
Expand Down
16 changes: 11 additions & 5 deletions internal/pkg/template/templates/workloads/partials/cf/envvars-common.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,19 @@
{{- end}}
{{- end}}
{{- end}}{{- end}}
{{- if eq .WorkloadType "Load Balanced Web Service"}}
{{- if .ALBListener}}
- Name: COPILOT_LB_DNS
{{- if .ImportedALB}}
{{- if eq .WorkloadType "Load Balanced Web Service"}}
{{- if .ImportedALB}}
Value: {{.ImportedALB.DNSName}}
{{- else}}
{{- else}}
Value: !GetAtt EnvControllerAction.PublicLoadBalancerDNSName
{{- end}}
{{- end}}
{{- end}}
{{- else if eq .WorkloadType "Backend Service"}}
{{- if .ImportedALB}}
Value: {{.ImportedALB.DNSName}}
{{- else}}
Value: !GetAtt EnvControllerAction.InternalLoadBalancerDNSName
{{- end}}
{{- end}}
{{- end}}
Loading