[COMMON] Update Gateway-API resource definitions

[oom.git] / kubernetes / common / common / templates / _ingress.tpl

diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index 968cb65..ca23c75 100644 (file)
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -305,7 +305,7 @@ true
 */}}
 {{- define "ingress.config.port" -}}
 {{-   $dot := default . .dot -}}
-{{ range .Values.ingress.service }}
+{{ range $dot.Values.ingress.service }}
 {{-   $baseaddr := (required "'baseaddr' param, set to the specific part of the fqdn, is required." .baseaddr) }}
   - host: {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
     http:
@@ -570,17 +570,22 @@ metadata:
   name: {{ $baseaddr }}-{{ $service.exposedPort }}-route
 spec:
   parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
 {{-     if eq $gateway "-" }}
-    - name: {{ $baseaddr }}-gateway
+      name: {{ $baseaddr }}-gateway
 {{-     else }}
-    - name: {{ $gateway }}
+      name: {{ $gateway }}
 {{-     end }}
       namespace: {{ $namespace }}
       sectionName: udp-{{ $service.exposedPort }}
   rules:
     - backendRefs:
-      - name: {{ $service.name }}
+      - group: ''
+        kind: Service
+        name: {{ $service.name }}
         port: {{ $service.port }}
+        weight: 1
 {{-   else if eq $protocol "tcp" }}
 ---
 apiVersion: gateway.networking.k8s.io/v1alpha2
@@ -589,17 +594,22 @@ metadata:
   name: {{ $baseaddr }}-{{ $service.exposedPort }}-route
 spec:
   parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
 {{-     if eq $gateway "-" }}
-    - name: {{ $baseaddr }}-gateway
+      name: {{ $baseaddr }}-gateway
 {{-     else }}
-    - name: {{ $gateway }}
+      name: {{ $gateway }}
 {{-     end }}
       namespace: {{ $namespace }}
       sectionName: tcp-{{ $service.exposedPort }}
   rules:
     - backendRefs:
-      - name: {{ $service.name }}
+      - group: ''
+        kind: Service
+        name: {{ $service.name }}
         port: {{ $service.port }}
+        weight: 1
 {{-   else if eq $protocol "http" }}
 ---
 apiVersion: gateway.networking.k8s.io/v1beta1
@@ -608,10 +618,12 @@ metadata:
   name: {{ $baseaddr }}-http-route
 spec:
   parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
 {{-     if eq $gateway "-" }}
-    - name: {{ $baseaddr }}-gateway
+      name: {{ $baseaddr }}-gateway
 {{-     else }}
-    - name: {{ $gateway }}
+      name: {{ $gateway }}
 {{-     end }}
       namespace: {{ $namespace }}
 {{-     if (include "common.ingress._tlsRedirect" (dict "dot" $dot)) }}
@@ -623,8 +635,11 @@ spec:
     - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
   rules:
     - backendRefs:
-      - name: {{ $service.name }}
+      - group: ''
+        kind: Service
+        name: {{ $service.name }}
         port: {{ $service.port }}
+        weight: 1
       matches:
         - path:
             type: PathPrefix
@@ -637,10 +652,12 @@ metadata:
   name: {{ $baseaddr }}-redirect-route
 spec:
   parentRefs:
+    - group: gateway.networking.k8s.io
+      kind: Gateway
 {{-       if eq $gateway "-" }}
-    - name: {{ $baseaddr }}-gateway
+      name: {{ $baseaddr }}-gateway
 {{-       else }}
-    - name: {{ $gateway }}
+      name: {{ $gateway }}
 {{-       end }}
       namespace: {{ $namespace }}
       sectionName: {{ include "common.ingress._gatewayHTTPListener" (dict "dot" $dot) }}
@@ -719,7 +736,7 @@ spec:
 {{- define "common.nginxIngress" -}}
 {{- $dot := default . .dot -}}
 {{  range $dot.Values.ingress.service }}
-{{    if eq (include "common.ingress._protocol" (dict "dot" .)) "http" }}
+{{    if eq (include "common.ingress._protocol" (dict "dot" $dot)) "http" }}
 {{      $baseaddr := required "baseaddr" .baseaddr }}
 apiVersion: networking.k8s.io/v1
 kind: Ingress
@@ -734,7 +751,7 @@ metadata:
     heritage: {{ $dot.Release.Service }}
 spec:
   rules:
-  {{ include "ingress.config.port" . | trim }}
+  {{ include "ingress.config.port" $dot | trim }}
 {{-     if $dot.Values.ingress.tls }}
   tls:
 {{ toYaml $dot.Values.ingress.tls | indent 4 }}
@@ -743,7 +760,7 @@ spec:
 {{-       if $dot.Values.ingress.config.tls }}
   tls:
   - hosts:
-    - {{ include "ingress.config.host" (dict "dot" . "baseaddr" $baseaddr) }}
+    - {{ include "ingress.config.host" (dict "dot" $dot "baseaddr" $baseaddr) }}
     secretName: {{ required "secret" (tpl (default "" $dot.Values.ingress.config.tls.secret) $dot) }}
 {{-       end }}
 {{-     end }}