feat: Set stick tables to type ipv6

cloudfoundry · Mar 19, 2024 · 34195df · 34195df
1 parent 66ba663
commit 34195df
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/docs/rate_limiting.md b/docs/rate_limiting.md
@@ -47,7 +47,7 @@ config:
 #### Resulting `haproxy.config`
 ```ini
 backend st_http_req_rate
-    stick-table type ip size 1m expire 10s store http_req_rate(10s)
+    stick-table type ipv6 size 1m expire 10s store http_req_rate(10s)
 # [...]
 frontend http-in
     http-request track-sc1 src table st_http_req_rate
@@ -68,7 +68,7 @@ config:
 #### Resulting `haproxy.config`
 ```ini
 backend st_http_req_rate
-    stick-table type ip size 1m expire 10s store http_req_rate(10s)
+    stick-table type ipv6 size 1m expire 10s store http_req_rate(10s)
 # [...]
 frontend http-in
     http-request track-sc1 src table st_http_req_rate
@@ -95,10 +95,10 @@ config:
 #### Resulting `haproxy.config`
 ```ini
 backend st_http_req_rate
-    stick-table type ip size 1m expire 10s store http_req_rate(10s)
+    stick-table type ipv6 size 1m expire 10s store http_req_rate(10s)
 
 backend st_tcp_conn_rate
-    stick-table type ip size 1m expire 10s store conn_rate(10s)
+    stick-table type ipv6 size 1m expire 10s store conn_rate(10s)
 # [...]
 frontend http-in
     # [...]

diff --git a/jobs/haproxy/templates/haproxy.config.erb b/jobs/haproxy/templates/haproxy.config.erb
@@ -344,12 +344,12 @@ resolvers default
 
 <% if_p("ha_proxy.requests_rate_limit.table_size", "ha_proxy.requests_rate_limit.window_size") do |table_size, window_size| %>
 backend st_http_req_rate
-    stick-table type ip size <%= table_size %> expire <%= window_size %> store http_req_rate(<%= window_size %>)
+    stick-table type ipv6 size <%= table_size %> expire <%= window_size %> store http_req_rate(<%= window_size %>)
 <% end %>
 
 <% if_p("ha_proxy.connections_rate_limit.table_size", "ha_proxy.connections_rate_limit.window_size") do |table_size, window_size| %>
 backend st_tcp_conn_rate
-    stick-table type ip size <%= table_size %> expire <%= window_size %> store conn_rate(<%= window_size %>)
+    stick-table type ipv6 size <%= table_size %> expire <%= window_size %> store conn_rate(<%= window_size %>)
 <% end %>
 
 <% unless p("ha_proxy.disable_http") -%>

diff --git a/spec/haproxy/templates/haproxy_config/rate_limit_spec.rb b/spec/haproxy/templates/haproxy_config/rate_limit_spec.rb
@@ -37,7 +37,7 @@
     let(:properties) { temp_properties }
 
     it 'sets up stick-tables' do
-      expect(backend_req_rate).to include('stick-table type ip size 10m expire 10s store http_req_rate(10s)')
+      expect(backend_req_rate).to include('stick-table type ipv6 size 10m expire 10s store http_req_rate(10s)')
     end
 
     it 'tracks requests in stick tables' do
@@ -78,7 +78,7 @@
     let(:properties) { temp_properties }
 
     it 'sets up stick-tables' do
-      expect(backend_conn_rate).to include('stick-table type ip size 10m expire 10s store conn_rate(10s)')
+      expect(backend_conn_rate).to include('stick-table type ipv6 size 10m expire 10s store conn_rate(10s)')
     end
 
     it 'tracks connections in stick tables' do