HTTP/3 add quic to default server, filter out backlog parameter for quic, fix Helm Chart containerUdpPort value type

Author: marcel2012

charts/ingress-nginx/README.md

@@ -318,7 +318,7 @@ metadata:
 | controller.containerName | string | `"controller"` | Configures the controller container name |
 | controller.containerPort | object | `{"http":80,"https":443}` | Configures the TCP ports that the nginx-controller listens on |
 | controller.containerSecurityContext | object | `{}` | Security context for controller containers |
-| controller.containerUdpPort | list | `[]` | Configures the UDP ports that the nginx-controller listens on |
+| controller.containerUdpPort | object | `{}` | Configures the UDP ports that the nginx-controller listens on |
 | controller.customTemplate.configMapKey | string | `""` |  |
 | controller.customTemplate.configMapName | string | `""` |  |
 | controller.disableLeaderElection | bool | `false` | This configuration disable Nginx Controller Leader Election |

charts/ingress-nginx/values.yaml

@@ -52,7 +52,7 @@ controller:
     http: 80
     https: 443
   # -- Configures the UDP ports that the nginx-controller listens on
-  containerUdpPort: []
+  containerUdpPort: {}
   # quic: 443
   # -- Global configuration passed to the ConfigMap consumed by the controller. Values may contain Helm templates.
   # Ref.: https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/

internal/ingress/controller/template/template.go

@@ -1384,7 +1384,7 @@ func buildHTTPListener(t, s interface{}) string {
 		addrV4 = tc.Cfg.BindAddressIpv4
 	}
 
-	co := commonListenOptions(&tc, hostname)
+	co := commonListenOptions(&tc, hostname, true)
 
 	out = append(out, httpListener(addrV4, co, &tc)...)
 
@@ -1417,14 +1417,18 @@ func buildHTTPSListener(t, s interface{}) string {
 		return ""
 	}
 
-	co := commonListenOptions(&tc, hostname)
+	httpsCo := commonListenOptions(&tc, hostname, true)
+	quicCo := commonListenOptions(&tc, hostname, false)
 
 	addrV4 := []string{""}
 	if len(tc.Cfg.BindAddressIpv4) > 0 {
 		addrV4 = tc.Cfg.BindAddressIpv4
 	}
 
-	out = append(out, httpsListener(addrV4, co, &tc)...)
+	out = append(out, httpsListener(addrV4, httpsCo, &tc)...)
+	if tc.IsQUICEnabled {
+		out = append(out, quicListener(addrV4, quicCo, &tc)...)
+	}
 
 	if !tc.IsIPV6Enabled {
 		return strings.Join(out, "\n")
@@ -1435,12 +1439,15 @@ func buildHTTPSListener(t, s interface{}) string {
 		addrV6 = tc.Cfg.BindAddressIpv6
 	}
 
-	out = append(out, httpsListener(addrV6, co, &tc)...)
+	out = append(out, httpsListener(addrV6, httpsCo, &tc)...)
+	if tc.IsQUICEnabled {
+		out = append(out, quicListener(addrV6, quicCo, &tc)...)
+	}
 
 	return strings.Join(out, "\n")
 }
 
-func commonListenOptions(template *config.TemplateConfig, hostname string) string {
+func commonListenOptions(template *config.TemplateConfig, hostname string, withBacklog bool) string {
 	var out []string
 
 	if template.Cfg.UseProxyProtocol {
@@ -1459,7 +1466,9 @@ func commonListenOptions(template *config.TemplateConfig, hostname string) strin
 		out = append(out, "reuseport")
 	}
 
-	out = append(out, fmt.Sprintf("backlog=%v", template.BacklogSize))
+	if withBacklog {
+		out = append(out, fmt.Sprintf("backlog=%v", template.BacklogSize))
+	}
 
 	return strings.Join(out, " ")
 }
@@ -1509,13 +1518,12 @@ func httpsListener(addresses []string, co string, tc *config.TemplateConfig) []s
 
 		out = append(out, strings.Join(lo, " "))
 	}
-	if !tc.IsQUICEnabled {
-		return out
-	}
-	if strings.Contains(co, "backlog=") {
-		klog.V(3).InfoS("Skipping HTTP/3 because of incompatible backlog parameter")
-		return out
-	}
+
+	return out
+}
+
+func quicListener(addresses []string, co string, tc *config.TemplateConfig) []string {
+	out := make([]string, 0)
 	for _, address := range addresses {
 		lo := []string{"listen"}