Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
float
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
micah
float
Commits
ad018af2
Commit
ad018af2
authored
3 years ago
by
ale
Browse files
Options
Downloads
Patches
Plain Diff
Support public_port field for public_tcp_endpoints
It can be different than the internal port.
parent
67a1e7c1
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/float-infra-haproxy/templates/firewall/20haproxy.j2
+2
-2
2 additions, 2 deletions
roles/float-infra-haproxy/templates/firewall/20haproxy.j2
roles/float-infra-haproxy/templates/haproxy.cfg.j2
+3
-3
3 additions, 3 deletions
roles/float-infra-haproxy/templates/haproxy.cfg.j2
with
5 additions
and
5 deletions
roles/float-infra-haproxy/templates/firewall/20haproxy.j2
+
2
−
2
View file @
ad018af2
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
allow_port tcp {{ port }}
allow_port tcp {{ port }}
{% endfor %}
{% endfor %}
{% else %}
{% else %}
allow_port tcp {{ ep.p
ort
}}
allow_port tcp {{ ep.p
ublic_port | default(ep.port)
}}
{% endif %}
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
{% endfor %}
This diff is collapsed.
Click to expand it.
roles/float-infra-haproxy/templates/haproxy.cfg.j2
+
3
−
3
View file @
ad018af2
...
@@ -47,11 +47,11 @@ backend be_{{ service_name }}_{{ ep.name }}_{{ port }}
...
@@ -47,11 +47,11 @@ backend be_{{ service_name }}_{{ ep.name }}_{{ port }}
{% endfor %} # ep.ports
{% endfor %} # ep.ports
{% else %}
{% else %}
frontend fe_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
{% set public_port = ep.public_port | default(ep.port) %}
bind :::{{ ep.port }}
frontend fe_{{ service_name }}_{{ ep.name }}_{{ public_port }}
bind :::{{ public_port }}
default_backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
default_backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
backend be_{{ service_name }}_{{ ep.name }}_{{ ep.port }}
log global
log global
balance leastconn
balance leastconn
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment