fix: Fixing various issues on gatewayAPI and reverted wrong state of values.yaml

Author: localleon

helm/nessie/README.md

@@ -134,11 +134,9 @@ gatewayApi:
           backendRefs:
             - service:
                 port: 19120
-								port: 19120
 ```
 
-If `gatewayApi.enabled` remains `false`, no Gateway API objects are rendered and the existing
-Make sure the Gateway API CRDs (and a compatible controller such as Envoy Gateway or Istio) are
+If `gatewayApi.enabled` remains `false`, no Gateway API objects are rendered. Make sure the Gateway API CRDs (and a compatible controller such as Envoy Gateway or Istio) are
 installed in the cluster before enabling this feature; the chart will fail fast if the resources
 are unavailable. A more advanced sample configuration can be found in
 `helm/nessie/ci/gateway-api-values.yaml`, which is also used by the chart unit tests.

helm/nessie/README.md.gotmpl

@@ -138,8 +138,7 @@ gatewayApi:
                 port: 19120
 ```
 
-If `gatewayApi.enabled` remains `false`, no Gateway API objects are rendered and the existing
-Make sure the Gateway API CRDs (and a compatible controller such as Envoy Gateway or Istio) are
+If `gatewayApi.enabled` remains `false`, no Gateway API objects are rendered. Make sure the Gateway API CRDs (and a compatible controller such as Envoy Gateway or Istio) are
 installed in the cluster before enabling this feature; the chart will fail fast if the resources
 are unavailable. A more advanced sample configuration can be found in
 `helm/nessie/ci/gateway-api-values.yaml`, which is also used by the chart unit tests.

helm/nessie/ci/gateway-api-values.yaml

@@ -1,8 +1,6 @@
 gatewayApi:
   enabled: true
   gateway:
-    name: public-gateway
-    namespace: default
     gatewayClassName: traefik # we just choose a common gatewayClass here
     listeners:
       - name: https
@@ -11,16 +9,15 @@ gatewayApi:
         protocol: HTTPS
         allowedRoutes:
           namespaces:
-            from: All
+            from: Same
         tls:
           enabled: true
           mode: Terminate
           certificateRefs:
             - name: nessie-cert
               kind: Secret
   httpRoutes:
-    - name: public-route
-      namespace: edge
+    - name: nessie-httproute
       hostnames:
         - chart-example.local
       parentRefs:
@@ -31,7 +28,7 @@ gatewayApi:
         - matches:
             - path:
                 type: PathPrefix
-                value: /api
+                value: /
           backendRefs:
             - name: release-name-nessie
               namespace: default

helm/nessie/templates/httproute.yaml

@@ -82,8 +82,8 @@ spec:
 {{- range $backend := $backends }}
         {{- $service := $backend.service | default (dict) -}}
         {{- $computedServiceName := default (printf "%s%s" (include "nessie.fullname" $) (default "" $service.nameSuffix)) $service.name -}}
-        {{- $name := default $computedServiceName $backend.name -}}
-        {{- $name = required "gatewayApi.httpRoutes[].rules[].backendRefs[] requires a backend name" $name -}}
+        {{- $explicitName := default "" $backend.name -}}
+        {{- $name := default $computedServiceName $explicitName -}}
         {{- $serviceNamespace := default $routeNamespace $service.namespace -}}
         {{- $backendNamespace := default $serviceNamespace $backend.namespace -}}
         {{- $port := default (default $service.port $defaultBackendPort) $backend.port -}}
@@ -95,9 +95,7 @@ spec:
           {{- with $backend.group }}
           group: {{ . }}
           {{- end }}
-          {{- if $kind }}
           kind: {{ $kind }}
-          {{- end }}
           port: {{ required "gatewayApi.httpRoutes[].rules[].backendRefs[] requires a port" $port }}
           {{- with $backend.weight }}
           weight: {{ . }}

helm/nessie/tests/gateway_api_test.yaml

@@ -80,11 +80,6 @@ tests:
           path: spec.rules[0].backendRefs[0].port
           value: 19120
         template: httproute.yaml
-      - equal:
-          documentIndex: 0
-          path: spec.rules[0].backendRefs[0].kind
-          value: Service
-        template: httproute.yaml
 
   - it: should allow custom TLS listener and explicit parentRefs/backends
     values:

helm/nessie/values.yaml

@@ -880,51 +880,101 @@ ingress:
 #      secretName: secret1
 
 # Nessie Gateway API Settings ###
-# The chart will render a `Gateway` and one or more
-# `HTTPRoute` objects that target the main Nessie Service by default. Only the GA
-# `gateway.networking.k8s.io/v1` resources are rendered; make sure the v1 CRDs are installed in the
-# cluster.
-
+# -- Gateway API support (Gateway + HTTPRoute resources)
+# Use this section to expose Nessie through the Kubernetes Gateway API instead of the traditional Ingress resource.
 gatewayApi:
+  # -- Specifies whether Gateway/HTTPRoute resources should be created.
   enabled: false
   gateway:
-    name: public-gateway
-    namespace: default
-    gatewayClassName: traefik # we just choose a common gatewayClass here
+    # -- Optional explicit name for the Gateway. If empty, the chart fullname plus nameSuffix is used.
+    name: ""
+    # -- Optional suffix appended to the autogenerated name when `name` is not set.
+    nameSuffix: ""
+    # -- Optional namespace override for the Gateway resource (defaults to the release namespace).
+    namespace: ""
+    # -- The GatewayClass to target. Required when gatewayApi is enabled.
+    gatewayClassName: ""
+    # -- Labels to add to the Gateway metadata.
+    labels: {}
+    # -- Annotations to add to the Gateway metadata.
+    annotations: {}
+    # -- Optional addresses block passed directly to the Gateway spec.
+    addresses: []
+    #  - type: NamedAddress
+    #    value: shared-gateway
+    # -- Listeners describe how traffic enters the Gateway.
     listeners:
-      - name: https
-        hostname: chart-example.local
-        port: 443
-        protocol: HTTPS
+      - # -- Listener name. Must be unique per Gateway.
+        name: nessie-http
+        # -- Optional hostname (wildcard supported, e.g. "nessie.example.com"). Leave empty to accept all hostnames.
+        hostname: ""
+        # -- Listener port.
+        port: 80
+        # -- Protocol handled by the listener. Typically HTTP or HTTPS.
+        protocol: HTTP
+        # -- Allowed routes constraints for this listener. Defaults to namespaces.from=Same when omitted.
         allowedRoutes:
           namespaces:
-            from: All
+            from: Same
         tls:
-          enabled: true
+          # -- Whether TLS should be configured for this listener.
+          enabled: false
+          # -- TLS mode (Terminate, Passthrough, etc.).
           mode: Terminate
-          certificateRefs:
-            - name: nessie-cert
-              kind: Secret
+          # -- List of certificate references for this listener.
+          certificateRefs: []
+          #    - name: nessie-cert
+          #      kind: Secret
+          #      group: ""
+          #      namespace: ""
+          # -- Optional TLS options map.
+          options: {}
   httpRoutes:
-    - name: public-route
-      namespace: edge
-      hostnames:
-        - chart-example.local
-      parentRefs:
-        - name: infra-gateway
-          namespace: default
-          sectionName: https
+    - # -- Optional explicit name for the HTTPRoute.
+      name: ""
+      # -- Optional suffix appended to the autogenerated name when `name` is not set.
+      nameSuffix: "-httproute"
+      # -- Optional namespace override for the HTTPRoute (defaults to the release namespace).
+      namespace: ""
+      # -- Labels to add to the HTTPRoute metadata.
+      labels: {}
+      # -- Annotations to add to the HTTPRoute metadata.
+      annotations: {}
+      # -- Hostnames handled by this route. Leave empty to match all hostnames.
+      hostnames: []
+      # -- Parent references attached to the route. When empty, the chart-generated Gateway is referenced automatically.
+      parentRefs: []
+      # -- Rules evaluated by the HTTPRoute.
       rules:
         - matches:
             - path:
                 type: PathPrefix
-                value: /api
+                value: /
+              headers: []
+          filters: []
           backendRefs:
-            - name: release-name-nessie
-              namespace: default
-              port: 8080
-              weight: 2
-
+            - # -- Optionally reference a Service managed by this chart.
+              service:
+                # -- Optional explicit service name. If empty, fullname plus nameSuffix is used.
+                name: ""
+                # -- Optional suffix appended to the release fullname when service.name is empty.
+                nameSuffix: ""
+                # -- Optional namespace override for the backend Service.
+                namespace: ""
+                # -- Optional port override for the backend Service. When empty, the first service port is used.
+                port: ~
+              # -- Explicit backend name. Takes precedence over service.* if set.
+              name: ""
+              # -- Optional backend namespace. Defaults to the HTTPRoute namespace when unset.
+              namespace: ""
+              # -- Optional backend group override.
+              group: ""
+              # -- Optional backend kind override (defaults to Service when using service.* helper).
+              kind: ""
+              # -- Optional backend port. When unset, the service port or chart default is used.
+              port: ~
+              # -- Optional backend weight.
+              weight: 1
 
 # -- Override the strategy for nessie deployment.
 # Valid values for type are: RollingUpdate and Recreate.