add fix to not render backendRefs when we have a requestredirect

Signed-off-by: Christopher Larivière <[email protected]>

Author: larivierec

charts/library/common/Chart.yaml

@@ -3,7 +3,7 @@ apiVersion: v2
 name: common
 description: Function library for Helm charts
 type: library
-version: 3.7.2
+version: 3.7.3
 kubeVersion: ">=1.22.0-0"
 keywords:
   - common
@@ -17,7 +17,4 @@ annotations:
   artifacthub.io/changes: |-
     - kind: fixed
       description: |-
-        The Apache 2.0 LICENSE file has been added to the chart.
-    - kind: fixed
-      description: |-
-        Fixed non-deterministic selection of primary service and port.
+        fixes rendering of backendRefs with RequestRedirects filters.

charts/library/common/templates/classes/_route.tpl

@@ -59,26 +59,34 @@ spec:
   {{- end }}
   rules:
   {{- range $routeObject.rules }}
-  - backendRefs:
-    {{- range .backendRefs }}
-      {{ $service := include "bjw-s.common.lib.service.getByIdentifier" (dict "rootContext" $rootContext "id" .name) | fromYaml -}}
-      {{ $servicePrimaryPort := dict -}}
-      {{ if $service -}}
-        {{ $servicePrimaryPort = include "bjw-s.common.lib.service.primaryPort" (dict "rootContext" $rootContext "serviceObject" $service) | fromYaml -}}
+    {{- $hasRequestRedirect := false -}}
+    {{- range .filters }}
+      {{- if eq .type "RequestRedirect" }}
+        {{- $hasRequestRedirect = true -}}
+      {{- end }}
+    {{- end }}
+    {{- if not $hasRequestRedirect }}
+    - backendRefs:
+      {{- range .backendRefs }}
+        {{ $service := include "bjw-s.common.lib.service.getByIdentifier" (dict "rootContext" $rootContext "id" .name) | fromYaml -}}
+        {{ $servicePrimaryPort := dict -}}
+        {{ if $service -}}
+          {{ $servicePrimaryPort = include "bjw-s.common.lib.service.primaryPort" (dict "rootContext" $rootContext "serviceObject" $service) | fromYaml -}}
+        {{- end }}
+      - group: {{ default "" .group | quote}}
+        kind: {{ default "Service" .kind }}
+        name: {{ default .name $service.name }}
+        namespace: {{ default $rootContext.Release.Namespace .namespace }}
+        port: {{ default .port $servicePrimaryPort.port }}
+        weight: {{ include "bjw-s.common.lib.defaultKeepNonNullValue" (dict "value" .weight "default" 1) }}
       {{- end }}
-    - group: {{ default "" .group | quote}}
-      kind: {{ default "Service" .kind }}
-      name: {{ default .name $service.name }}
-      namespace: {{ default $rootContext.Release.Namespace .namespace }}
-      port: {{ default .port $servicePrimaryPort.port }}
-      weight: {{ include "bjw-s.common.lib.defaultKeepNonNullValue" (dict "value" .weight "default" 1) }}
     {{- end }}
     {{- if or (eq $routeKind "HTTPRoute") (eq $routeKind "GRPCRoute") }}
       {{- with .matches }}
     matches:
         {{- toYaml . | nindent 6 }}
       {{- end }}
-        {{- with .filters }}
+      {{- with .filters }}
     filters:
         {{- toYaml . | nindent 6 }}
       {{- end }}