Skip to content

Commit cad184c

Browse files
committed
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 <[email protected]>
1 parent 31776df commit cad184c

File tree

5 files changed

+16
-3
lines changed

5 files changed

+16
-3
lines changed

kubernetes-ingress/Chart.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ apiVersion: v2
1616
name: kubernetes-ingress
1717
description: A Helm chart for HAProxy Kubernetes Ingress Controller
1818
type: application
19-
version: 1.38.3
19+
version: 1.38.4
2020
appVersion: 1.11.1
2121
kubeVersion: ">=1.22.0-0"
2222
keywords:
@@ -32,4 +32,5 @@ maintainers:
3232
engine: gotpl
3333
annotations:
3434
artifacthub.io/changes: |
35-
- Use Ingress Controller 1.11.1 version for base image
35+
- Add metrics service-specific metadata (#229)
36+
- Enable QUIC only for K8s 1.24 (#230) due to MixedProtocolLBService feature gate

kubernetes-ingress/templates/NOTES.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,11 @@ Service ports mapped are:
2323
containerPort: {{ $value }}
2424
protocol: TCP
2525
{{- end }}
26+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
2627
- name: quic
2728
containerPort: {{ .Values.controller.containerPort.https }}
2829
protocol: UDP
30+
{{- end }}
2931
{{- range .Values.controller.service.tcpPorts }}
3032
- name: {{ .name }}-tcp
3133
containerPort: {{ .targetPort }}
@@ -47,6 +49,7 @@ Service ports mapped are:
4749
hostIP: {{ $hostIP }}
4850
{{- end }}
4951
{{- end }}
52+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
5053
- name: quic
5154
containerPort: {{ .Values.controller.containerPort.https }}
5255
protocol: UDP
@@ -56,6 +59,7 @@ Service ports mapped are:
5659
{{- if $hostIP }}
5760
hostIP: {{ $hostIP }}
5861
{{- end }}
62+
{{- end }}
5963
{{- range .Values.controller.service.tcpPorts }}
6064
- name: {{ .name }}-tcp
6165
containerPort: {{ .port }}

kubernetes-ingress/templates/controller-daemonset.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ spec:
101101
- --configmap={{ include "kubernetes-ingress.namespace" . }}/{{ include "kubernetes-ingress.fullname" . }}
102102
- --http-bind-port={{ .Values.controller.containerPort.http }}
103103
- --https-bind-port={{ .Values.controller.containerPort.https }}
104+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
104105
- --quic-bind-port={{ .Values.controller.containerPort.https }}
105106
- --quic-announce-port={{ .Values.controller.service.ports.https }}
107+
{{- end }}
106108
{{- if .Values.controller.ingressClass }}
107109
- --ingress.class={{ .Values.controller.ingressClass }}
108110
{{- end }}
@@ -149,6 +151,7 @@ spec:
149151
hostIP: {{ $hostIP }}
150152
{{- end }}
151153
{{- end }}
154+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
152155
- name: quic
153156
containerPort: {{ .Values.controller.containerPort.https }}
154157
protocol: UDP
@@ -158,6 +161,7 @@ spec:
158161
{{- if $hostIP }}
159162
hostIP: {{ $hostIP }}
160163
{{- end }}
164+
{{- end }}
161165
{{- range .Values.controller.service.tcpPorts }}
162166
- name: {{ .name }}-tcp
163167
containerPort: {{ .port }}

kubernetes-ingress/templates/controller-deployment.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,8 +101,10 @@ spec:
101101
- --configmap={{ include "kubernetes-ingress.namespace" . }}/{{ include "kubernetes-ingress.fullname" . }}
102102
- --http-bind-port={{ .Values.controller.containerPort.http }}
103103
- --https-bind-port={{ .Values.controller.containerPort.https }}
104+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
104105
- --quic-bind-port={{ .Values.controller.containerPort.https }}
105106
- --quic-announce-port={{ .Values.controller.service.ports.https }}
107+
{{- end }}
106108
{{- if .Values.controller.ingressClass }}
107109
- --ingress.class={{ .Values.controller.ingressClass }}
108110
{{- end }}
@@ -143,9 +145,11 @@ spec:
143145
containerPort: {{ $value }}
144146
protocol: TCP
145147
{{- end }}
148+
{{- if semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version }}
146149
- name: quic
147150
containerPort: {{ .Values.controller.containerPort.https }}
148151
protocol: UDP
152+
{{- end }}
149153
{{- range .Values.controller.service.tcpPorts }}
150154
- name: {{ .name }}-tcp
151155
containerPort: {{ .targetPort }}

kubernetes-ingress/templates/controller-service.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ spec:
6767
nodePort: {{ .Values.controller.service.nodePorts.https }}
6868
{{- end }}
6969
{{- end }}
70-
{{- if .Values.controller.service.enablePorts.quic }}
70+
{{- if and (semverCompare ">=1.24.0-0" .Capabilities.KubeVersion.Version) .Values.controller.service.enablePorts.quic }}
7171
- name: quic
7272
port: {{ .Values.controller.service.ports.https }}
7373
protocol: UDP

0 commit comments

Comments
 (0)