aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Geissler <andreas-geissler@telekom.de>2023-09-29 14:02:04 +0200
committerAndreas Geissler <andreas-geissler@telekom.de>2023-10-02 14:49:47 +0000
commit8d57918746be63112542f7d47602adc043398565 (patch)
treee1775587b315573bf704f822c91e29af49cefa7a
parentcfd8434fe9484b9219560159094b174421d6d6a2 (diff)
[COMMON] Update Gateway-API resource definitions
Update the definitions based on test results to avoid ArgoCD resyncs. Issue-ID: OOM-3184 Change-Id: I0e87d0bbea4a45a480fe078e4d9ae7a0f22ff764 Signed-off-by: Andreas Geissler <andreas-geissler@telekom.de>
-rw-r--r--kubernetes/common/common/templates/_ingress.tpl39
1 files changed, 28 insertions, 11 deletions
diff --git a/kubernetes/common/common/templates/_ingress.tpl b/kubernetes/common/common/templates/_ingress.tpl
index c469bc7c7e..ca23c75896 100644
--- a/kubernetes/common/common/templates/_ingress.tpl
+++ b/kubernetes/common/common/templates/_ingress.tpl
@@ -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) }}