Skip to content

Commit d83ded9

Browse files
committed
RELEASE/MINOR: kubernetes-ingress: Tag release 1.30.2
Changes in kubernetes-ingress: - Further improvements to Gateway API setup Signed-off-by: Dinko Korunic <[email protected]>
1 parent 04a2b13 commit d83ded9

File tree

7 files changed

+41
-9
lines changed

7 files changed

+41
-9
lines changed

kubernetes-ingress/Chart.yaml

Lines changed: 2 additions & 3 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.30.1
19+
version: 1.30.2
2020
appVersion: 1.10.1
2121
kubeVersion: ">=1.22.0-0"
2222
keywords:
@@ -32,5 +32,4 @@ maintainers:
3232
engine: gotpl
3333
annotations:
3434
artifacthub.io/changes: |
35-
- Add support for gateway-controller-name (#185)
36-
- Use Ingress Controller 1.10.1 version for base image
35+
- Further improvements to Gateway API setup
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
controller:
2+
kind: DaemonSet
3+
kubernetesGateway:
4+
enabled: true
5+
gatewayControllerName: haproxy.org/gateway-controller
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
controller:
2+
kubernetesGateway:
3+
enabled: true
4+
gatewayControllerName: haproxy.org/gateway-controller

kubernetes-ingress/templates/clusterrole.yaml

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,4 +87,25 @@ rules:
8787
- list
8888
- watch
8989
- update
90+
{{- if .Values.controller.kubernetesGateway.enabled }}
91+
- apiGroups:
92+
- "gateway.networking.k8s.io"
93+
resources:
94+
- referencegrants
95+
- gateways
96+
- gatewayclasses
97+
- tcproutes
98+
verbs:
99+
- get
100+
- list
101+
- watch
102+
- apiGroups:
103+
- "gateway.networking.k8s.io"
104+
resources:
105+
- gatewayclasses/status
106+
- gateways/status
107+
- tcproutes/status
108+
verbs:
109+
- update
110+
{{- end }}
90111
{{- end -}}

kubernetes-ingress/templates/controller-daemonset.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,8 @@ spec:
103103
{{- if .Values.controller.ingressClass }}
104104
- --ingress.class={{ .Values.controller.ingressClass }}
105105
{{- end }}
106-
{{- if .Values.controller.gatewayControllerName }}
107-
- --gateway-controller-name={{ .Values.controller.gatewayControllerName }}
106+
{{- if and .Values.controller.kubernetesGateway.enabled .Values.controller.kubernetesGateway.gatewayControllerName }}
107+
- --gateway-controller-name={{ .Values.controller.kubernetesGateway.gatewayControllerName }}
108108
{{- end }}
109109
{{- if .Values.controller.publishService.enabled }}
110110
- --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}

kubernetes-ingress/templates/controller-deployment.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,8 @@ spec:
104104
{{- if .Values.controller.ingressClass }}
105105
- --ingress.class={{ .Values.controller.ingressClass }}
106106
{{- end }}
107-
{{- if .Values.controller.gatewayControllerName }}
108-
- --gateway-controller-name={{ .Values.controller.gatewayControllerName }}
107+
{{- if and .Values.controller.kubernetesGateway.enabled .Values.controller.kubernetesGateway.gatewayControllerName }}
108+
- --gateway-controller-name={{ .Values.controller.kubernetesGateway.gatewayControllerName }}
109109
{{- end }}
110110
{{- if .Values.controller.publishService.enabled }}
111111
- --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}

kubernetes-ingress/values.yaml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,9 +160,12 @@ controller:
160160
# ref: https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/#using-multiple-ingress-controllers
161161
ingressClass: haproxy # typically "haproxy" or null to receive all events
162162

163-
# Gateway API controller, not available in k8s as default, but can be installed
163+
# Gateway API controller, not available in K8s as default but can be installed
164164
# ref: https://gateway-api.sigs.k8s.io/
165-
# gatewayControllerName: haproxy.org/gateway-controller
165+
# ref: https://gateway-api.sigs.k8s.io/guides/#installing-a-gateway-controller
166+
kubernetesGateway:
167+
enabled: false
168+
gatewayControllerName: haproxy.org/gateway-controller
166169

167170
## Additional labels to add to the deployment or daemonset metadata
168171
## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/

0 commit comments

Comments
 (0)