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]>

Author: dkorunic

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.30.1
+version: 1.30.2
 appVersion: 1.10.1
 kubeVersion: ">=1.22.0-0"
 keywords:
@@ -32,5 +32,4 @@ maintainers:
 engine: gotpl
 annotations:
   artifacthub.io/changes: |
-    - Add support for gateway-controller-name (#185)
-    - Use Ingress Controller 1.10.1 version for base image
+    - Further improvements to Gateway API setup

kubernetes-ingress/ci/daemonset-kubernetesgateway-values.yaml

@@ -0,0 +1,5 @@
+controller:
+  kind: DaemonSet
+  kubernetesGateway:
+    enabled: true
+    gatewayControllerName: haproxy.org/gateway-controller

kubernetes-ingress/ci/deployment-kubernetesgateway-values.yaml

@@ -0,0 +1,4 @@
+controller:
+  kubernetesGateway:
+    enabled: true
+    gatewayControllerName: haproxy.org/gateway-controller

kubernetes-ingress/templates/clusterrole.yaml

@@ -87,4 +87,25 @@ rules:
   - list
   - watch
   - update
+{{- if .Values.controller.kubernetesGateway.enabled }}
+- apiGroups:
+  - "gateway.networking.k8s.io"
+  resources:
+  - referencegrants
+  - gateways
+  - gatewayclasses
+  - tcproutes
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - "gateway.networking.k8s.io"
+  resources:
+  - gatewayclasses/status
+  - gateways/status
+  - tcproutes/status
+  verbs:
+  - update
+{{- end }}
 {{- end -}}

kubernetes-ingress/templates/controller-daemonset.yaml

@@ -103,8 +103,8 @@ spec:
 {{- if .Values.controller.ingressClass }}
           - --ingress.class={{ .Values.controller.ingressClass }}
 {{- end }}
-{{- if .Values.controller.gatewayControllerName }}
-          - --gateway-controller-name={{ .Values.controller.gatewayControllerName }}
+{{- if and .Values.controller.kubernetesGateway.enabled .Values.controller.kubernetesGateway.gatewayControllerName }}
+          - --gateway-controller-name={{ .Values.controller.kubernetesGateway.gatewayControllerName }}
 {{- end }}
 {{- if .Values.controller.publishService.enabled }}
           - --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}

kubernetes-ingress/templates/controller-deployment.yaml

@@ -104,8 +104,8 @@ spec:
 {{- if .Values.controller.ingressClass }}
           - --ingress.class={{ .Values.controller.ingressClass }}
 {{- end }}
-{{- if .Values.controller.gatewayControllerName }}
-          - --gateway-controller-name={{ .Values.controller.gatewayControllerName }}
+{{- if and .Values.controller.kubernetesGateway.enabled .Values.controller.kubernetesGateway.gatewayControllerName }}
+          - --gateway-controller-name={{ .Values.controller.kubernetesGateway.gatewayControllerName }}
 {{- end }}
 {{- if .Values.controller.publishService.enabled }}
           - --publish-service={{ template "kubernetes-ingress.publishServicePath" . }}

kubernetes-ingress/values.yaml

@@ -160,9 +160,12 @@ controller:
   # ref: https://kubernetes.io/docs/concepts/services-networking/ingress-controllers/#using-multiple-ingress-controllers
   ingressClass: haproxy   # typically "haproxy" or null to receive all events
 
-  # Gateway API controller, not available in k8s as default, but can be installed
+  # Gateway API controller, not available in K8s as default but can be installed
   # ref: https://gateway-api.sigs.k8s.io/
-  # gatewayControllerName: haproxy.org/gateway-controller
+  # ref: https://gateway-api.sigs.k8s.io/guides/#installing-a-gateway-controller
+  kubernetesGateway:
+    enabled: false
+    gatewayControllerName: haproxy.org/gateway-controller
 
   ## Additional labels to add to the deployment or daemonset metadata
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/labels/