RELEASE/MINOR: kubernetes-ingress: Tag release 1.38.4

Changes in kubernetes-ingress: - Add metrics service-specific metadata (#229) - Enable QUIC only for K8s 1.24 (#230) due to MixedProtocolLBService feature gate Signed-off-by: Dinko Korunic <dkorunic@haproxy.com>
haproxytech · Mar 20, 2024 · cad184c · cad184c
1 parent 31776df
commit cad184c
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/kubernetes-ingress/Chart.yaml b/kubernetes-ingress/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v2
 name: kubernetes-ingress
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 type: application
-version: 1.38.3
+version: 1.38.4
 appVersion: 1.11.1
 kubeVersion: ">=1.22.0-0"
 keywords:
@@ -32,4 +32,5 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Use Ingress Controller 1.11.1 version for base image
+    - Add metrics service-specific metadata (#229)
+    - Enable QUIC only for K8s 1.24 (#230) due to MixedProtocolLBService feature gate
diff --git a/kubernetes-ingress/templates/NOTES.txt b/kubernetes-ingress/templates/NOTES.txt
@@ -23,9 +23,11 @@ Service ports mapped are:
     containerPort: {{ $value }}
     protocol: TCP
 {{- end }}
+{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
   - name: quic
     containerPort: {{ .Values.controller.containerPort.https }}
     protocol: UDP
+{{- end }}
 {{- range .Values.controller.service.tcpPorts }}
   - name: {{ .name }}-tcp
     containerPort: {{ .targetPort }}
@@ -47,6 +49,7 @@ Service ports mapped are:
     hostIP: {{ $hostIP }}
 {{- end }}
 {{- end }}
+{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
   - name: quic
     containerPort: {{ .Values.controller.containerPort.https }}
     protocol: UDP
@@ -56,6 +59,7 @@ Service ports mapped are:
 {{- if $hostIP }}
     hostIP: {{ $hostIP }}
 {{- end }}
+{{- end }}
 {{- range .Values.controller.service.tcpPorts }}
   - name: {{ .name }}-tcp
     containerPort: {{ .port }}

diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -101,8 +101,10 @@ 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 }}
           - --quic-bind-port={{ .Values.controller.containerPort.https }}
           - --quic-announce-port={{ .Values.controller.service.ports.https }}
+{{- end }}
 {{- if .Values.controller.ingressClass }}
           - --ingress.class={{ .Values.controller.ingressClass }}
 {{- end }}
@@ -149,6 +151,7 @@ spec:
               hostIP: {{ $hostIP }}
               {{- end }}
           {{- end }}
+          {{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
             - name: quic
               containerPort: {{ .Values.controller.containerPort.https }}
               protocol: UDP
@@ -158,6 +161,7 @@ spec:
               {{- if $hostIP }}
               hostIP: {{ $hostIP }}
               {{- end }}
+          {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
             - name: {{ .name }}-tcp
               containerPort: {{ .port }}

diff --git a/kubernetes-ingress/templates/controller-deployment.yaml b/kubernetes-ingress/templates/controller-deployment.yaml
@@ -101,8 +101,10 @@ 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 }}
           - --quic-bind-port={{ .Values.controller.containerPort.https }}
           - --quic-announce-port={{ .Values.controller.service.ports.https }}
+{{- end }}
 {{- if .Values.controller.ingressClass }}
           - --ingress.class={{ .Values.controller.ingressClass }}
 {{- end }}
@@ -143,9 +145,11 @@ spec:
               containerPort: {{ $value }}
               protocol: TCP
           {{- end }}
+          {{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
             - name: quic
               containerPort: {{ .Values.controller.containerPort.https }}
               protocol: UDP
+          {{- end }}
           {{- range .Values.controller.service.tcpPorts }}
             - name: {{ .name }}-tcp
               containerPort: {{ .targetPort }}

diff --git a/kubernetes-ingress/templates/controller-service.yaml b/kubernetes-ingress/templates/controller-service.yaml
@@ -67,7 +67,7 @@ spec:
       nodePort: {{ .Values.controller.service.nodePorts.https }}
     {{- end }}
   {{- end }}
-  {{- if .Values.controller.service.enablePorts.quic }}
+  {{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
     - name: quic
       port: {{ .Values.controller.service.ports.https }}
       protocol: UDP