FEATURE/MINOR: kubernetes-ingress: Disable QUIC everywhere if .Values…

….controller.service.enablePorts.quic is false
haproxytech · Apr 8, 2024 · 8dc2396 · 8dc2396
1 parent 9c6179c
commit 8dc2396
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/kubernetes-ingress/templates/NOTES.txt b/kubernetes-ingress/templates/NOTES.txt
@@ -23,7 +23,7 @@ Service ports mapped are:
     containerPort: {{ $value }}
     protocol: TCP
 {{- end }}
-{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+{{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
   - name: quic
     containerPort: {{ .Values.controller.containerPort.https }}
     protocol: UDP
@@ -49,7 +49,7 @@ Service ports mapped are:
     hostIP: {{ $hostIP }}
 {{- end }}
 {{- end }}
-{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+{{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
   - name: quic
     containerPort: {{ .Values.controller.containerPort.https }}
     protocol: UDP

diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -101,7 +101,7 @@ spec:
           - --configmap={{ include "kubernetes-ingress.namespace" . }}/{{ include "kubernetes-ingress.fullname" . }}
           - --http-bind-port={{ .Values.controller.containerPort.http }}
           - --https-bind-port={{ .Values.controller.containerPort.https }}
-{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+{{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
           - --quic-bind-port={{ .Values.controller.containerPort.https }}
           - --quic-announce-port={{ .Values.controller.service.ports.https }}
 {{- end }}
@@ -151,7 +151,7 @@ spec:
               hostIP: {{ $hostIP }}
               {{- end }}
           {{- end }}
-          {{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+          {{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
             - name: quic
               containerPort: {{ .Values.controller.containerPort.https }}
               protocol: UDP

diff --git a/kubernetes-ingress/templates/controller-deployment.yaml b/kubernetes-ingress/templates/controller-deployment.yaml
@@ -101,7 +101,7 @@ spec:
           - --configmap={{ include "kubernetes-ingress.namespace" . }}/{{ include "kubernetes-ingress.fullname" . }}
           - --http-bind-port={{ .Values.controller.containerPort.http }}
           - --https-bind-port={{ .Values.controller.containerPort.https }}
-{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+{{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
           - --quic-bind-port={{ .Values.controller.containerPort.https }}
           - --quic-announce-port={{ .Values.controller.service.ports.https }}
 {{- end }}
@@ -145,7 +145,7 @@ spec:
               containerPort: {{ $value }}
               protocol: TCP
           {{- end }}
-          {{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
+          {{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
             - name: quic
               containerPort: {{ .Values.controller.containerPort.https }}
               protocol: UDP