From 9e3a80ebaf2b432ebd3b9688cd810f151fceb201 Mon Sep 17 00:00:00 2001 From: Jindrich Skupa Date: Mon, 13 Sep 2021 23:21:14 +0200 Subject: [PATCH 1/2] Update ingress definition for k8s 1.22+ --- edge-caiasoft/templates/ingress.yaml | 4 +++- edge-connexion/templates/ingress.yaml | 4 +++- edge-dematic/templates/ingress.yaml | 4 +++- edge-ea-data-export/templates/ingress.yaml | 4 +++- edge-ncip/templates/ingress.yaml | 4 +++- edge-oai-pmh/templates/ingress.yaml | 4 +++- edge-orders/templates/ingress.yaml | 4 +++- edge-patron/templates/ingress.yaml | 4 +++- edge-rtac/templates/ingress.yaml | 4 +++- edge-sip2/templates/ingress.yaml | 4 +++- mod-aes/templates/ingress.yaml | 4 +++- mod-agreements/templates/ingress.yaml | 4 +++- mod-audit/templates/ingress.yaml | 4 +++- mod-authtoken/templates/ingress.yaml | 4 +++- mod-calendar/templates/ingress.yaml | 4 +++- mod-circulation-storage/templates/ingress.yaml | 4 +++- mod-circulation/templates/ingress.yaml | 4 +++- mod-codex-ekb/templates/ingress.yaml | 4 +++- mod-codex-inventory/templates/ingress.yaml | 4 +++- mod-codex-mux/templates/ingress.yaml | 4 +++- mod-configuration/templates/ingress.yaml | 4 +++- mod-copycat/templates/ingress.yaml | 4 +++- mod-courses/templates/ingress.yaml | 4 +++- mod-data-export-spring/templates/ingress.yaml | 4 +++- mod-data-export-worker/templates/ingress.yaml | 4 +++- mod-data-export/templates/ingress.yaml | 4 +++- mod-data-import-converter-storage/templates/ingress.yaml | 4 +++- mod-data-import/templates/ingress.yaml | 4 +++- mod-ebsconet/templates/ingress.yaml | 4 +++- mod-email/templates/ingress.yaml | 4 +++- mod-erm-usage-harvester/templates/ingress.yaml | 4 +++- mod-erm-usage/templates/ingress.yaml | 4 +++- mod-event-config/templates/ingress.yaml | 4 +++- mod-feesfines/templates/ingress.yaml | 4 +++- mod-finance-storage/templates/ingress.yaml | 4 +++- mod-finance/templates/ingress.yaml | 4 +++- mod-gobi/templates/ingress.yaml | 4 +++- mod-graphql/templates/ingress.yaml | 4 +++- mod-inn-reach/templates/ingress.yaml | 4 +++- mod-inventory-storage/templates/ingress.yaml | 4 +++- mod-inventory/templates/ingress.yaml | 4 +++- mod-invoice-storage/templates/ingress.yaml | 4 +++- mod-invoice/templates/ingress.yaml | 4 +++- mod-kb-ebsco-java/templates/ingress.yaml | 4 +++- mod-ldp/templates/ingress.yaml | 4 +++- mod-licenses/templates/ingress.yaml | 4 +++- mod-login-saml/templates/ingress.yaml | 4 +++- mod-login/templates/ingress.yaml | 4 +++- mod-marccat/templates/ingress.yaml | 4 +++- mod-ncip/templates/ingress.yaml | 4 +++- mod-notes/templates/ingress.yaml | 4 +++- mod-notify/templates/ingress.yaml | 4 +++- mod-oai-pmh/templates/ingress.yaml | 4 +++- mod-orders-storage/templates/ingress.yaml | 4 +++- mod-orders/templates/ingress.yaml | 4 +++- mod-organizations-storage/templates/ingress.yaml | 4 +++- mod-organizations/templates/ingress.yaml | 4 +++- mod-password-validator/templates/ingress.yaml | 4 +++- mod-patron-blocks/templates/ingress.yaml | 4 +++- mod-patron/templates/ingress.yaml | 4 +++- mod-permissions/templates/ingress.yaml | 4 +++- mod-pubsub/templates/ingress.yaml | 4 +++- mod-quick-marc/templates/ingress.yaml | 4 +++- mod-remote-storage/templates/ingress.yaml | 4 +++- mod-rtac/templates/ingress.yaml | 4 +++- mod-search/templates/ingress.yaml | 4 +++- mod-sender/templates/ingress.yaml | 4 +++- mod-source-record-manager/templates/ingress.yaml | 4 +++- mod-source-record-storage/templates/ingress.yaml | 4 +++- mod-tags/templates/ingress.yaml | 4 +++- mod-template-engine/templates/ingress.yaml | 4 +++- mod-user-import/templates/ingress.yaml | 4 +++- mod-users-bl/templates/ingress.yaml | 4 +++- mod-users/templates/ingress.yaml | 4 +++- okapi/templates/ingress.yaml | 4 +++- pgadmin4/templates/_helpers.tpl | 4 +++- platform-complete/templates/ingress.yaml | 4 +++- platform-core/templates/ingress.yaml | 4 +++- 78 files changed, 234 insertions(+), 78 deletions(-) diff --git a/edge-caiasoft/templates/ingress.yaml b/edge-caiasoft/templates/ingress.yaml index 304795ee..98d6cefc 100644 --- a/edge-caiasoft/templates/ingress.yaml +++ b/edge-caiasoft/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-caiasoft.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-connexion/templates/ingress.yaml b/edge-connexion/templates/ingress.yaml index b0b0da11..8e67ecef 100644 --- a/edge-connexion/templates/ingress.yaml +++ b/edge-connexion/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-connexion.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-dematic/templates/ingress.yaml b/edge-dematic/templates/ingress.yaml index 8fae16eb..6e7f01be 100644 --- a/edge-dematic/templates/ingress.yaml +++ b/edge-dematic/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-dematic.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-ea-data-export/templates/ingress.yaml b/edge-ea-data-export/templates/ingress.yaml index f76fa9ff..73f3e9b8 100644 --- a/edge-ea-data-export/templates/ingress.yaml +++ b/edge-ea-data-export/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-ea-data-export.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-ncip/templates/ingress.yaml b/edge-ncip/templates/ingress.yaml index 93710e1a..a1d6af3a 100644 --- a/edge-ncip/templates/ingress.yaml +++ b/edge-ncip/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-ncip.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-oai-pmh/templates/ingress.yaml b/edge-oai-pmh/templates/ingress.yaml index adebf12c..7c6523bc 100644 --- a/edge-oai-pmh/templates/ingress.yaml +++ b/edge-oai-pmh/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-oai-pmh.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-orders/templates/ingress.yaml b/edge-orders/templates/ingress.yaml index 2e58e359..f6cfb10c 100644 --- a/edge-orders/templates/ingress.yaml +++ b/edge-orders/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-orders.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-patron/templates/ingress.yaml b/edge-patron/templates/ingress.yaml index 2b621237..7cc1b31e 100644 --- a/edge-patron/templates/ingress.yaml +++ b/edge-patron/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-patron.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-rtac/templates/ingress.yaml b/edge-rtac/templates/ingress.yaml index 34e50456..9856777a 100644 --- a/edge-rtac/templates/ingress.yaml +++ b/edge-rtac/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-rtac.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/edge-sip2/templates/ingress.yaml b/edge-sip2/templates/ingress.yaml index 4aaf7e4f..46e8359a 100644 --- a/edge-sip2/templates/ingress.yaml +++ b/edge-sip2/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "edge-sip2.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-aes/templates/ingress.yaml b/mod-aes/templates/ingress.yaml index 460862e0..92faeefc 100644 --- a/mod-aes/templates/ingress.yaml +++ b/mod-aes/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-aes.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-agreements/templates/ingress.yaml b/mod-agreements/templates/ingress.yaml index 40129fe3..fdd6808d 100644 --- a/mod-agreements/templates/ingress.yaml +++ b/mod-agreements/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-agreements.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-audit/templates/ingress.yaml b/mod-audit/templates/ingress.yaml index eb6a9c0f..67b13063 100644 --- a/mod-audit/templates/ingress.yaml +++ b/mod-audit/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-audit.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-authtoken/templates/ingress.yaml b/mod-authtoken/templates/ingress.yaml index 30852f60..4b9ef710 100644 --- a/mod-authtoken/templates/ingress.yaml +++ b/mod-authtoken/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-authtoken.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-calendar/templates/ingress.yaml b/mod-calendar/templates/ingress.yaml index 90382392..df234cd9 100644 --- a/mod-calendar/templates/ingress.yaml +++ b/mod-calendar/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-calendar.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-circulation-storage/templates/ingress.yaml b/mod-circulation-storage/templates/ingress.yaml index b84593d9..8822e721 100644 --- a/mod-circulation-storage/templates/ingress.yaml +++ b/mod-circulation-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-circulation-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-circulation/templates/ingress.yaml b/mod-circulation/templates/ingress.yaml index 578ffa57..d64e38ba 100644 --- a/mod-circulation/templates/ingress.yaml +++ b/mod-circulation/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-circulation.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-codex-ekb/templates/ingress.yaml b/mod-codex-ekb/templates/ingress.yaml index 85d96aa6..ea4b6b9a 100644 --- a/mod-codex-ekb/templates/ingress.yaml +++ b/mod-codex-ekb/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-codex-ekb.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-codex-inventory/templates/ingress.yaml b/mod-codex-inventory/templates/ingress.yaml index 60083940..f637cfb8 100644 --- a/mod-codex-inventory/templates/ingress.yaml +++ b/mod-codex-inventory/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-codex-inventory.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-codex-mux/templates/ingress.yaml b/mod-codex-mux/templates/ingress.yaml index 13d8b718..de2b635a 100644 --- a/mod-codex-mux/templates/ingress.yaml +++ b/mod-codex-mux/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-codex-mux.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-configuration/templates/ingress.yaml b/mod-configuration/templates/ingress.yaml index 3cfb68b2..329e97ba 100644 --- a/mod-configuration/templates/ingress.yaml +++ b/mod-configuration/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-configuration.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-copycat/templates/ingress.yaml b/mod-copycat/templates/ingress.yaml index fd19b9e4..c6b9de0f 100644 --- a/mod-copycat/templates/ingress.yaml +++ b/mod-copycat/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-copycat.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-courses/templates/ingress.yaml b/mod-courses/templates/ingress.yaml index 4332fc41..c4530374 100644 --- a/mod-courses/templates/ingress.yaml +++ b/mod-courses/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-courses.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-data-export-spring/templates/ingress.yaml b/mod-data-export-spring/templates/ingress.yaml index 66ccf9c4..b0232a25 100644 --- a/mod-data-export-spring/templates/ingress.yaml +++ b/mod-data-export-spring/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-data-export-spring.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-data-export-worker/templates/ingress.yaml b/mod-data-export-worker/templates/ingress.yaml index d62527b5..029d6a9b 100644 --- a/mod-data-export-worker/templates/ingress.yaml +++ b/mod-data-export-worker/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-data-export-worker.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-data-export/templates/ingress.yaml b/mod-data-export/templates/ingress.yaml index f05d24c3..23ae919c 100644 --- a/mod-data-export/templates/ingress.yaml +++ b/mod-data-export/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-data-export.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-data-import-converter-storage/templates/ingress.yaml b/mod-data-import-converter-storage/templates/ingress.yaml index 837ec6e2..4d4dad0e 100644 --- a/mod-data-import-converter-storage/templates/ingress.yaml +++ b/mod-data-import-converter-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-data-import-converter-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-data-import/templates/ingress.yaml b/mod-data-import/templates/ingress.yaml index 72dfd11b..b6acc6e4 100644 --- a/mod-data-import/templates/ingress.yaml +++ b/mod-data-import/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-data-import.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-ebsconet/templates/ingress.yaml b/mod-ebsconet/templates/ingress.yaml index f5ba9c90..6f173c22 100644 --- a/mod-ebsconet/templates/ingress.yaml +++ b/mod-ebsconet/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-ebsconet.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-email/templates/ingress.yaml b/mod-email/templates/ingress.yaml index edf274a3..e7d8a2df 100644 --- a/mod-email/templates/ingress.yaml +++ b/mod-email/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-email.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-erm-usage-harvester/templates/ingress.yaml b/mod-erm-usage-harvester/templates/ingress.yaml index b2674600..8d84f9f8 100644 --- a/mod-erm-usage-harvester/templates/ingress.yaml +++ b/mod-erm-usage-harvester/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-erm-usage-harvester.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-erm-usage/templates/ingress.yaml b/mod-erm-usage/templates/ingress.yaml index a05701cc..ae6c7f5b 100644 --- a/mod-erm-usage/templates/ingress.yaml +++ b/mod-erm-usage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-erm-usage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-event-config/templates/ingress.yaml b/mod-event-config/templates/ingress.yaml index 3b30e0b8..b5454197 100644 --- a/mod-event-config/templates/ingress.yaml +++ b/mod-event-config/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-event-config.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-feesfines/templates/ingress.yaml b/mod-feesfines/templates/ingress.yaml index c2d6f6b6..4c557f9e 100644 --- a/mod-feesfines/templates/ingress.yaml +++ b/mod-feesfines/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-feesfines.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-finance-storage/templates/ingress.yaml b/mod-finance-storage/templates/ingress.yaml index 3a3940d9..94c8a39d 100644 --- a/mod-finance-storage/templates/ingress.yaml +++ b/mod-finance-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-finance-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-finance/templates/ingress.yaml b/mod-finance/templates/ingress.yaml index ad9f29ba..94c2cf85 100644 --- a/mod-finance/templates/ingress.yaml +++ b/mod-finance/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-finance.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-gobi/templates/ingress.yaml b/mod-gobi/templates/ingress.yaml index 70f527a4..261f1f72 100644 --- a/mod-gobi/templates/ingress.yaml +++ b/mod-gobi/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-gobi.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-graphql/templates/ingress.yaml b/mod-graphql/templates/ingress.yaml index 0d108075..b3210d1c 100644 --- a/mod-graphql/templates/ingress.yaml +++ b/mod-graphql/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-graphql.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-inn-reach/templates/ingress.yaml b/mod-inn-reach/templates/ingress.yaml index 4f1b6399..40b230af 100644 --- a/mod-inn-reach/templates/ingress.yaml +++ b/mod-inn-reach/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-inn-reach.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-inventory-storage/templates/ingress.yaml b/mod-inventory-storage/templates/ingress.yaml index cab3258d..6d618a88 100644 --- a/mod-inventory-storage/templates/ingress.yaml +++ b/mod-inventory-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-inventory-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-inventory/templates/ingress.yaml b/mod-inventory/templates/ingress.yaml index 9dbc8ed8..3fba5532 100644 --- a/mod-inventory/templates/ingress.yaml +++ b/mod-inventory/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-inventory.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-invoice-storage/templates/ingress.yaml b/mod-invoice-storage/templates/ingress.yaml index 45f794d3..5cdfeb7e 100644 --- a/mod-invoice-storage/templates/ingress.yaml +++ b/mod-invoice-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-invoice-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-invoice/templates/ingress.yaml b/mod-invoice/templates/ingress.yaml index c88d93db..00c8f7cf 100644 --- a/mod-invoice/templates/ingress.yaml +++ b/mod-invoice/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-invoice.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-kb-ebsco-java/templates/ingress.yaml b/mod-kb-ebsco-java/templates/ingress.yaml index 08b8b642..9ba93c74 100644 --- a/mod-kb-ebsco-java/templates/ingress.yaml +++ b/mod-kb-ebsco-java/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-kb-ebsco-java.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-ldp/templates/ingress.yaml b/mod-ldp/templates/ingress.yaml index 6bcecb08..4ee45b3c 100644 --- a/mod-ldp/templates/ingress.yaml +++ b/mod-ldp/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-ldp.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-licenses/templates/ingress.yaml b/mod-licenses/templates/ingress.yaml index 1a49082f..15a03596 100644 --- a/mod-licenses/templates/ingress.yaml +++ b/mod-licenses/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-licenses.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-login-saml/templates/ingress.yaml b/mod-login-saml/templates/ingress.yaml index 4ffbfa30..c576fb92 100644 --- a/mod-login-saml/templates/ingress.yaml +++ b/mod-login-saml/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-login-saml.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-login/templates/ingress.yaml b/mod-login/templates/ingress.yaml index 2f342944..f11dbbed 100644 --- a/mod-login/templates/ingress.yaml +++ b/mod-login/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-login.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-marccat/templates/ingress.yaml b/mod-marccat/templates/ingress.yaml index a748f715..f2a7522c 100644 --- a/mod-marccat/templates/ingress.yaml +++ b/mod-marccat/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-marccat.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-ncip/templates/ingress.yaml b/mod-ncip/templates/ingress.yaml index a103f9cf..168e8e7d 100644 --- a/mod-ncip/templates/ingress.yaml +++ b/mod-ncip/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-ncip.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-notes/templates/ingress.yaml b/mod-notes/templates/ingress.yaml index 54b462ca..5790393e 100644 --- a/mod-notes/templates/ingress.yaml +++ b/mod-notes/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-notes.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-notify/templates/ingress.yaml b/mod-notify/templates/ingress.yaml index 8378a7e1..67f79119 100644 --- a/mod-notify/templates/ingress.yaml +++ b/mod-notify/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-notify.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-oai-pmh/templates/ingress.yaml b/mod-oai-pmh/templates/ingress.yaml index 75630b1b..b1285db2 100644 --- a/mod-oai-pmh/templates/ingress.yaml +++ b/mod-oai-pmh/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-oai-pmh.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-orders-storage/templates/ingress.yaml b/mod-orders-storage/templates/ingress.yaml index 22a3d2b4..166ac2f5 100644 --- a/mod-orders-storage/templates/ingress.yaml +++ b/mod-orders-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-orders-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-orders/templates/ingress.yaml b/mod-orders/templates/ingress.yaml index fb58a898..7ba478a9 100644 --- a/mod-orders/templates/ingress.yaml +++ b/mod-orders/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-orders.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-organizations-storage/templates/ingress.yaml b/mod-organizations-storage/templates/ingress.yaml index 4123a172..bfea3768 100644 --- a/mod-organizations-storage/templates/ingress.yaml +++ b/mod-organizations-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-organizations-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-organizations/templates/ingress.yaml b/mod-organizations/templates/ingress.yaml index e3a8d90d..37fa6c4e 100644 --- a/mod-organizations/templates/ingress.yaml +++ b/mod-organizations/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-organizations.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-password-validator/templates/ingress.yaml b/mod-password-validator/templates/ingress.yaml index 84e9da55..1b730df8 100644 --- a/mod-password-validator/templates/ingress.yaml +++ b/mod-password-validator/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-password-validator.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-patron-blocks/templates/ingress.yaml b/mod-patron-blocks/templates/ingress.yaml index 28d6c02e..00113c3e 100644 --- a/mod-patron-blocks/templates/ingress.yaml +++ b/mod-patron-blocks/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-patron-blocks.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-patron/templates/ingress.yaml b/mod-patron/templates/ingress.yaml index ffe9eab6..f4351fc9 100644 --- a/mod-patron/templates/ingress.yaml +++ b/mod-patron/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-patron.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-permissions/templates/ingress.yaml b/mod-permissions/templates/ingress.yaml index 9334361d..be7ede7a 100644 --- a/mod-permissions/templates/ingress.yaml +++ b/mod-permissions/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-permissions.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-pubsub/templates/ingress.yaml b/mod-pubsub/templates/ingress.yaml index 918fd0f9..81b2e966 100644 --- a/mod-pubsub/templates/ingress.yaml +++ b/mod-pubsub/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-pubsub.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-quick-marc/templates/ingress.yaml b/mod-quick-marc/templates/ingress.yaml index 40a43dfe..847a8726 100644 --- a/mod-quick-marc/templates/ingress.yaml +++ b/mod-quick-marc/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-quick-marc.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-remote-storage/templates/ingress.yaml b/mod-remote-storage/templates/ingress.yaml index fceb12e8..0daacf43 100644 --- a/mod-remote-storage/templates/ingress.yaml +++ b/mod-remote-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-remote-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-rtac/templates/ingress.yaml b/mod-rtac/templates/ingress.yaml index b07b3da3..548040f1 100644 --- a/mod-rtac/templates/ingress.yaml +++ b/mod-rtac/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-rtac.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-search/templates/ingress.yaml b/mod-search/templates/ingress.yaml index b02c8661..ba087230 100644 --- a/mod-search/templates/ingress.yaml +++ b/mod-search/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-search.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-sender/templates/ingress.yaml b/mod-sender/templates/ingress.yaml index f8addcdc..47b8ad23 100644 --- a/mod-sender/templates/ingress.yaml +++ b/mod-sender/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-sender.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-source-record-manager/templates/ingress.yaml b/mod-source-record-manager/templates/ingress.yaml index 799fe71e..89e1ceef 100644 --- a/mod-source-record-manager/templates/ingress.yaml +++ b/mod-source-record-manager/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-source-record-manager.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-source-record-storage/templates/ingress.yaml b/mod-source-record-storage/templates/ingress.yaml index 0a2ec16e..2f4cb43b 100644 --- a/mod-source-record-storage/templates/ingress.yaml +++ b/mod-source-record-storage/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-source-record-storage.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-tags/templates/ingress.yaml b/mod-tags/templates/ingress.yaml index c9f8271d..7e4aadd4 100644 --- a/mod-tags/templates/ingress.yaml +++ b/mod-tags/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-tags.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-template-engine/templates/ingress.yaml b/mod-template-engine/templates/ingress.yaml index 1098d8f8..fd9e0c03 100644 --- a/mod-template-engine/templates/ingress.yaml +++ b/mod-template-engine/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-template-engine.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-user-import/templates/ingress.yaml b/mod-user-import/templates/ingress.yaml index 0bc105f5..058feddc 100644 --- a/mod-user-import/templates/ingress.yaml +++ b/mod-user-import/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-user-import.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-users-bl/templates/ingress.yaml b/mod-users-bl/templates/ingress.yaml index 1f0e75ff..febb44c7 100644 --- a/mod-users-bl/templates/ingress.yaml +++ b/mod-users-bl/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-users-bl.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/mod-users/templates/ingress.yaml b/mod-users/templates/ingress.yaml index 3b665c3f..6021282f 100644 --- a/mod-users/templates/ingress.yaml +++ b/mod-users/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "mod-users.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/okapi/templates/ingress.yaml b/okapi/templates/ingress.yaml index 8f1b7a91..610ae05e 100644 --- a/okapi/templates/ingress.yaml +++ b/okapi/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "okapi.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/pgadmin4/templates/_helpers.tpl b/pgadmin4/templates/_helpers.tpl index b9663c2f..24d0476c 100644 --- a/pgadmin4/templates/_helpers.tpl +++ b/pgadmin4/templates/_helpers.tpl @@ -77,7 +77,9 @@ Return the appropriate apiVersion for deployment. Return the appropriate apiVersion for ingress. */}} {{- define "ingress.apiVersion" -}} -{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} +{{- if .Capabilities.APIVersions.Has "networking.k8s.io/v1" }} +{{- print "networking.k8s.io/v1" -}} +{{- else if .Capabilities.APIVersions.Has "networking.k8s.io/v1beta1" }} {{- print "networking.k8s.io/v1beta1" -}} {{- else -}} {{- print "extensions/v1beta1" -}} diff --git a/platform-complete/templates/ingress.yaml b/platform-complete/templates/ingress.yaml index c1059d7c..a54b12de 100644 --- a/platform-complete/templates/ingress.yaml +++ b/platform-complete/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "platform-complete.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 diff --git a/platform-core/templates/ingress.yaml b/platform-core/templates/ingress.yaml index 1a211b18..d4f1d0cf 100644 --- a/platform-core/templates/ingress.yaml +++ b/platform-core/templates/ingress.yaml @@ -1,7 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "platform-core.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} apiVersion: networking.k8s.io/v1beta1 {{- else -}} apiVersion: extensions/v1beta1 From 8dedb4ca8880bd2baa401947ad32acdb08984a1d Mon Sep 17 00:00:00 2001 From: Jindrich Skupa Date: Tue, 14 Sep 2021 16:56:28 +0200 Subject: [PATCH 2/2] update path mapping for 1.19+ ingress spec --- edge-caiasoft/templates/ingress.yaml | 12 +++++++++++- edge-connexion/templates/ingress.yaml | 12 +++++++++++- edge-dematic/templates/ingress.yaml | 12 +++++++++++- edge-ea-data-export/templates/ingress.yaml | 12 +++++++++++- edge-ncip/templates/ingress.yaml | 12 +++++++++++- edge-oai-pmh/templates/ingress.yaml | 12 +++++++++++- edge-orders/templates/ingress.yaml | 12 +++++++++++- edge-patron/templates/ingress.yaml | 12 +++++++++++- edge-rtac/templates/ingress.yaml | 12 +++++++++++- edge-sip2/templates/ingress.yaml | 12 +++++++++++- mod-aes/templates/ingress.yaml | 12 +++++++++++- mod-agreements/templates/ingress.yaml | 12 +++++++++++- mod-audit/templates/ingress.yaml | 12 +++++++++++- mod-authtoken/templates/ingress.yaml | 12 +++++++++++- mod-calendar/templates/ingress.yaml | 12 +++++++++++- mod-circulation-storage/templates/ingress.yaml | 12 +++++++++++- mod-circulation/templates/ingress.yaml | 12 +++++++++++- mod-codex-ekb/templates/ingress.yaml | 12 +++++++++++- mod-codex-inventory/templates/ingress.yaml | 12 +++++++++++- mod-codex-mux/templates/ingress.yaml | 12 +++++++++++- mod-configuration/templates/ingress.yaml | 12 +++++++++++- mod-copycat/templates/ingress.yaml | 10 ++++++++++ mod-courses/templates/ingress.yaml | 12 +++++++++++- mod-data-export-spring/templates/ingress.yaml | 12 +++++++++++- mod-data-export-worker/templates/ingress.yaml | 12 +++++++++++- mod-data-export/templates/ingress.yaml | 12 +++++++++++- .../templates/ingress.yaml | 12 +++++++++++- mod-data-import/templates/ingress.yaml | 12 +++++++++++- mod-ebsconet/templates/ingress.yaml | 10 ++++++++++ mod-email/templates/ingress.yaml | 12 +++++++++++- mod-erm-usage-harvester/templates/ingress.yaml | 12 +++++++++++- mod-erm-usage/templates/ingress.yaml | 12 +++++++++++- mod-event-config/templates/ingress.yaml | 12 +++++++++++- mod-feesfines/templates/ingress.yaml | 12 +++++++++++- mod-finance-storage/templates/ingress.yaml | 12 +++++++++++- mod-finance/templates/ingress.yaml | 12 +++++++++++- mod-gobi/templates/ingress.yaml | 12 +++++++++++- mod-graphql/templates/ingress.yaml | 12 +++++++++++- mod-inn-reach/templates/ingress.yaml | 10 ++++++++++ mod-inventory-storage/templates/ingress.yaml | 12 +++++++++++- mod-inventory/templates/ingress.yaml | 12 +++++++++++- mod-invoice-storage/templates/ingress.yaml | 12 +++++++++++- mod-invoice/templates/ingress.yaml | 12 +++++++++++- mod-kb-ebsco-java/templates/ingress.yaml | 12 +++++++++++- mod-ldp/templates/ingress.yaml | 12 +++++++++++- mod-licenses/templates/ingress.yaml | 12 +++++++++++- mod-login-saml/templates/ingress.yaml | 12 +++++++++++- mod-login/templates/ingress.yaml | 12 +++++++++++- mod-marccat/templates/ingress.yaml | 12 +++++++++++- mod-ncip/templates/ingress.yaml | 12 +++++++++++- mod-notes/templates/ingress.yaml | 12 +++++++++++- mod-notify/templates/ingress.yaml | 12 +++++++++++- mod-oai-pmh/templates/ingress.yaml | 12 +++++++++++- mod-orders-storage/templates/ingress.yaml | 12 +++++++++++- mod-orders/templates/ingress.yaml | 12 +++++++++++- mod-organizations-storage/templates/ingress.yaml | 12 +++++++++++- mod-organizations/templates/ingress.yaml | 12 +++++++++++- mod-password-validator/templates/ingress.yaml | 12 +++++++++++- mod-patron-blocks/templates/ingress.yaml | 12 +++++++++++- mod-patron/templates/ingress.yaml | 12 +++++++++++- mod-permissions/templates/ingress.yaml | 12 +++++++++++- mod-pubsub/templates/ingress.yaml | 12 +++++++++++- mod-quick-marc/templates/ingress.yaml | 12 +++++++++++- mod-remote-storage/templates/ingress.yaml | 10 ++++++++++ mod-rtac/templates/ingress.yaml | 12 +++++++++++- mod-search/templates/ingress.yaml | 10 ++++++++++ mod-sender/templates/ingress.yaml | 12 +++++++++++- mod-source-record-manager/templates/ingress.yaml | 12 +++++++++++- mod-source-record-storage/templates/ingress.yaml | 12 +++++++++++- mod-tags/templates/ingress.yaml | 12 +++++++++++- mod-template-engine/templates/ingress.yaml | 12 +++++++++++- mod-user-import/templates/ingress.yaml | 12 +++++++++++- mod-users-bl/templates/ingress.yaml | 12 +++++++++++- mod-users/templates/ingress.yaml | 12 +++++++++++- okapi/templates/ingress.yaml | 12 +++++++++++- pgadmin4/templates/ingress.yaml | 7 +++++-- platform-complete/templates/ingress.yaml | 12 +++++++++++- platform-core/templates/ingress.yaml | 12 +++++++++++- 78 files changed, 847 insertions(+), 74 deletions(-) diff --git a/edge-caiasoft/templates/ingress.yaml b/edge-caiasoft/templates/ingress.yaml index 98d6cefc..2f280dfd 100644 --- a/edge-caiasoft/templates/ingress.yaml +++ b/edge-caiasoft/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-connexion/templates/ingress.yaml b/edge-connexion/templates/ingress.yaml index 8e67ecef..771ea0b9 100644 --- a/edge-connexion/templates/ingress.yaml +++ b/edge-connexion/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-dematic/templates/ingress.yaml b/edge-dematic/templates/ingress.yaml index 6e7f01be..9ecd9cf8 100644 --- a/edge-dematic/templates/ingress.yaml +++ b/edge-dematic/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-ea-data-export/templates/ingress.yaml b/edge-ea-data-export/templates/ingress.yaml index 73f3e9b8..03f097c9 100644 --- a/edge-ea-data-export/templates/ingress.yaml +++ b/edge-ea-data-export/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-ncip/templates/ingress.yaml b/edge-ncip/templates/ingress.yaml index a1d6af3a..f3b3d8a1 100644 --- a/edge-ncip/templates/ingress.yaml +++ b/edge-ncip/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-oai-pmh/templates/ingress.yaml b/edge-oai-pmh/templates/ingress.yaml index 7c6523bc..d77e5ba0 100644 --- a/edge-oai-pmh/templates/ingress.yaml +++ b/edge-oai-pmh/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-orders/templates/ingress.yaml b/edge-orders/templates/ingress.yaml index f6cfb10c..56ef66c3 100644 --- a/edge-orders/templates/ingress.yaml +++ b/edge-orders/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-patron/templates/ingress.yaml b/edge-patron/templates/ingress.yaml index 7cc1b31e..6ea3c8f5 100644 --- a/edge-patron/templates/ingress.yaml +++ b/edge-patron/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-rtac/templates/ingress.yaml b/edge-rtac/templates/ingress.yaml index 9856777a..807682c7 100644 --- a/edge-rtac/templates/ingress.yaml +++ b/edge-rtac/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/edge-sip2/templates/ingress.yaml b/edge-sip2/templates/ingress.yaml index 46e8359a..4b6c7c66 100644 --- a/edge-sip2/templates/ingress.yaml +++ b/edge-sip2/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-aes/templates/ingress.yaml b/mod-aes/templates/ingress.yaml index 92faeefc..abbc9d88 100644 --- a/mod-aes/templates/ingress.yaml +++ b/mod-aes/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-agreements/templates/ingress.yaml b/mod-agreements/templates/ingress.yaml index fdd6808d..8eea6895 100644 --- a/mod-agreements/templates/ingress.yaml +++ b/mod-agreements/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-audit/templates/ingress.yaml b/mod-audit/templates/ingress.yaml index 67b13063..cd6a733c 100644 --- a/mod-audit/templates/ingress.yaml +++ b/mod-audit/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-authtoken/templates/ingress.yaml b/mod-authtoken/templates/ingress.yaml index 4b9ef710..c63b6009 100644 --- a/mod-authtoken/templates/ingress.yaml +++ b/mod-authtoken/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-calendar/templates/ingress.yaml b/mod-calendar/templates/ingress.yaml index df234cd9..b29d0420 100644 --- a/mod-calendar/templates/ingress.yaml +++ b/mod-calendar/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-circulation-storage/templates/ingress.yaml b/mod-circulation-storage/templates/ingress.yaml index 8822e721..6fd6bbfc 100644 --- a/mod-circulation-storage/templates/ingress.yaml +++ b/mod-circulation-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-circulation/templates/ingress.yaml b/mod-circulation/templates/ingress.yaml index d64e38ba..8a865b09 100644 --- a/mod-circulation/templates/ingress.yaml +++ b/mod-circulation/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-codex-ekb/templates/ingress.yaml b/mod-codex-ekb/templates/ingress.yaml index ea4b6b9a..5820b83c 100644 --- a/mod-codex-ekb/templates/ingress.yaml +++ b/mod-codex-ekb/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-codex-inventory/templates/ingress.yaml b/mod-codex-inventory/templates/ingress.yaml index f637cfb8..a1318982 100644 --- a/mod-codex-inventory/templates/ingress.yaml +++ b/mod-codex-inventory/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-codex-mux/templates/ingress.yaml b/mod-codex-mux/templates/ingress.yaml index de2b635a..e9b641d2 100644 --- a/mod-codex-mux/templates/ingress.yaml +++ b/mod-codex-mux/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-configuration/templates/ingress.yaml b/mod-configuration/templates/ingress.yaml index 329e97ba..889c0e6f 100644 --- a/mod-configuration/templates/ingress.yaml +++ b/mod-configuration/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-copycat/templates/ingress.yaml b/mod-copycat/templates/ingress.yaml index c6b9de0f..df310cc1 100644 --- a/mod-copycat/templates/ingress.yaml +++ b/mod-copycat/templates/ingress.yaml @@ -35,9 +35,19 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-courses/templates/ingress.yaml b/mod-courses/templates/ingress.yaml index c4530374..8853c3bd 100644 --- a/mod-courses/templates/ingress.yaml +++ b/mod-courses/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-data-export-spring/templates/ingress.yaml b/mod-data-export-spring/templates/ingress.yaml index b0232a25..56812097 100644 --- a/mod-data-export-spring/templates/ingress.yaml +++ b/mod-data-export-spring/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-data-export-worker/templates/ingress.yaml b/mod-data-export-worker/templates/ingress.yaml index 029d6a9b..69ca3ae9 100644 --- a/mod-data-export-worker/templates/ingress.yaml +++ b/mod-data-export-worker/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-data-export/templates/ingress.yaml b/mod-data-export/templates/ingress.yaml index 23ae919c..105af0e8 100644 --- a/mod-data-export/templates/ingress.yaml +++ b/mod-data-export/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-data-import-converter-storage/templates/ingress.yaml b/mod-data-import-converter-storage/templates/ingress.yaml index 4d4dad0e..6cc2e449 100644 --- a/mod-data-import-converter-storage/templates/ingress.yaml +++ b/mod-data-import-converter-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-data-import/templates/ingress.yaml b/mod-data-import/templates/ingress.yaml index b6acc6e4..22b6da99 100644 --- a/mod-data-import/templates/ingress.yaml +++ b/mod-data-import/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-ebsconet/templates/ingress.yaml b/mod-ebsconet/templates/ingress.yaml index 6f173c22..d98fe540 100644 --- a/mod-ebsconet/templates/ingress.yaml +++ b/mod-ebsconet/templates/ingress.yaml @@ -35,9 +35,19 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-email/templates/ingress.yaml b/mod-email/templates/ingress.yaml index e7d8a2df..90e54304 100644 --- a/mod-email/templates/ingress.yaml +++ b/mod-email/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-erm-usage-harvester/templates/ingress.yaml b/mod-erm-usage-harvester/templates/ingress.yaml index 8d84f9f8..864f7b68 100644 --- a/mod-erm-usage-harvester/templates/ingress.yaml +++ b/mod-erm-usage-harvester/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-erm-usage/templates/ingress.yaml b/mod-erm-usage/templates/ingress.yaml index ae6c7f5b..cb177010 100644 --- a/mod-erm-usage/templates/ingress.yaml +++ b/mod-erm-usage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-event-config/templates/ingress.yaml b/mod-event-config/templates/ingress.yaml index b5454197..0e09666a 100644 --- a/mod-event-config/templates/ingress.yaml +++ b/mod-event-config/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-feesfines/templates/ingress.yaml b/mod-feesfines/templates/ingress.yaml index 4c557f9e..3baee120 100644 --- a/mod-feesfines/templates/ingress.yaml +++ b/mod-feesfines/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-finance-storage/templates/ingress.yaml b/mod-finance-storage/templates/ingress.yaml index 94c8a39d..79ca1041 100644 --- a/mod-finance-storage/templates/ingress.yaml +++ b/mod-finance-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-finance/templates/ingress.yaml b/mod-finance/templates/ingress.yaml index 94c2cf85..77929d12 100644 --- a/mod-finance/templates/ingress.yaml +++ b/mod-finance/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-gobi/templates/ingress.yaml b/mod-gobi/templates/ingress.yaml index 261f1f72..f12d2d9a 100644 --- a/mod-gobi/templates/ingress.yaml +++ b/mod-gobi/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-graphql/templates/ingress.yaml b/mod-graphql/templates/ingress.yaml index b3210d1c..1a3b41e9 100644 --- a/mod-graphql/templates/ingress.yaml +++ b/mod-graphql/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-inn-reach/templates/ingress.yaml b/mod-inn-reach/templates/ingress.yaml index 40b230af..e8b87313 100644 --- a/mod-inn-reach/templates/ingress.yaml +++ b/mod-inn-reach/templates/ingress.yaml @@ -35,9 +35,19 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-inventory-storage/templates/ingress.yaml b/mod-inventory-storage/templates/ingress.yaml index 6d618a88..e6c85966 100644 --- a/mod-inventory-storage/templates/ingress.yaml +++ b/mod-inventory-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-inventory/templates/ingress.yaml b/mod-inventory/templates/ingress.yaml index 3fba5532..7b3e090e 100644 --- a/mod-inventory/templates/ingress.yaml +++ b/mod-inventory/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-invoice-storage/templates/ingress.yaml b/mod-invoice-storage/templates/ingress.yaml index 5cdfeb7e..f98eb32b 100644 --- a/mod-invoice-storage/templates/ingress.yaml +++ b/mod-invoice-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-invoice/templates/ingress.yaml b/mod-invoice/templates/ingress.yaml index 00c8f7cf..d1454a83 100644 --- a/mod-invoice/templates/ingress.yaml +++ b/mod-invoice/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-kb-ebsco-java/templates/ingress.yaml b/mod-kb-ebsco-java/templates/ingress.yaml index 9ba93c74..69559ac7 100644 --- a/mod-kb-ebsco-java/templates/ingress.yaml +++ b/mod-kb-ebsco-java/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-ldp/templates/ingress.yaml b/mod-ldp/templates/ingress.yaml index 4ee45b3c..c8b211d1 100644 --- a/mod-ldp/templates/ingress.yaml +++ b/mod-ldp/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-licenses/templates/ingress.yaml b/mod-licenses/templates/ingress.yaml index 15a03596..907eb978 100644 --- a/mod-licenses/templates/ingress.yaml +++ b/mod-licenses/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-login-saml/templates/ingress.yaml b/mod-login-saml/templates/ingress.yaml index c576fb92..7f96e750 100644 --- a/mod-login-saml/templates/ingress.yaml +++ b/mod-login-saml/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-login/templates/ingress.yaml b/mod-login/templates/ingress.yaml index f11dbbed..b2be2415 100644 --- a/mod-login/templates/ingress.yaml +++ b/mod-login/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-marccat/templates/ingress.yaml b/mod-marccat/templates/ingress.yaml index f2a7522c..36e87455 100644 --- a/mod-marccat/templates/ingress.yaml +++ b/mod-marccat/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-ncip/templates/ingress.yaml b/mod-ncip/templates/ingress.yaml index 168e8e7d..b05e0f95 100644 --- a/mod-ncip/templates/ingress.yaml +++ b/mod-ncip/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-notes/templates/ingress.yaml b/mod-notes/templates/ingress.yaml index 5790393e..a4152d0e 100644 --- a/mod-notes/templates/ingress.yaml +++ b/mod-notes/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-notify/templates/ingress.yaml b/mod-notify/templates/ingress.yaml index 67f79119..fe989d94 100644 --- a/mod-notify/templates/ingress.yaml +++ b/mod-notify/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-oai-pmh/templates/ingress.yaml b/mod-oai-pmh/templates/ingress.yaml index b1285db2..00bc626f 100644 --- a/mod-oai-pmh/templates/ingress.yaml +++ b/mod-oai-pmh/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-orders-storage/templates/ingress.yaml b/mod-orders-storage/templates/ingress.yaml index 166ac2f5..328b3c6a 100644 --- a/mod-orders-storage/templates/ingress.yaml +++ b/mod-orders-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-orders/templates/ingress.yaml b/mod-orders/templates/ingress.yaml index 7ba478a9..522a625b 100644 --- a/mod-orders/templates/ingress.yaml +++ b/mod-orders/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-organizations-storage/templates/ingress.yaml b/mod-organizations-storage/templates/ingress.yaml index bfea3768..0e63055a 100644 --- a/mod-organizations-storage/templates/ingress.yaml +++ b/mod-organizations-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-organizations/templates/ingress.yaml b/mod-organizations/templates/ingress.yaml index 37fa6c4e..8a32f73e 100644 --- a/mod-organizations/templates/ingress.yaml +++ b/mod-organizations/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-password-validator/templates/ingress.yaml b/mod-password-validator/templates/ingress.yaml index 1b730df8..87b1cb02 100644 --- a/mod-password-validator/templates/ingress.yaml +++ b/mod-password-validator/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-patron-blocks/templates/ingress.yaml b/mod-patron-blocks/templates/ingress.yaml index 00113c3e..ec0efaea 100644 --- a/mod-patron-blocks/templates/ingress.yaml +++ b/mod-patron-blocks/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-patron/templates/ingress.yaml b/mod-patron/templates/ingress.yaml index f4351fc9..fb86522f 100644 --- a/mod-patron/templates/ingress.yaml +++ b/mod-patron/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-permissions/templates/ingress.yaml b/mod-permissions/templates/ingress.yaml index be7ede7a..334e1331 100644 --- a/mod-permissions/templates/ingress.yaml +++ b/mod-permissions/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-pubsub/templates/ingress.yaml b/mod-pubsub/templates/ingress.yaml index 81b2e966..0fc4f49a 100644 --- a/mod-pubsub/templates/ingress.yaml +++ b/mod-pubsub/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-quick-marc/templates/ingress.yaml b/mod-quick-marc/templates/ingress.yaml index 847a8726..e0ac7332 100644 --- a/mod-quick-marc/templates/ingress.yaml +++ b/mod-quick-marc/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-remote-storage/templates/ingress.yaml b/mod-remote-storage/templates/ingress.yaml index 0daacf43..22bbb621 100644 --- a/mod-remote-storage/templates/ingress.yaml +++ b/mod-remote-storage/templates/ingress.yaml @@ -35,9 +35,19 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-rtac/templates/ingress.yaml b/mod-rtac/templates/ingress.yaml index 548040f1..558dd15b 100644 --- a/mod-rtac/templates/ingress.yaml +++ b/mod-rtac/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-search/templates/ingress.yaml b/mod-search/templates/ingress.yaml index ba087230..7860ab9d 100644 --- a/mod-search/templates/ingress.yaml +++ b/mod-search/templates/ingress.yaml @@ -35,9 +35,19 @@ spec: paths: {{- range .paths }} - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-sender/templates/ingress.yaml b/mod-sender/templates/ingress.yaml index 47b8ad23..4bc4055f 100644 --- a/mod-sender/templates/ingress.yaml +++ b/mod-sender/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-source-record-manager/templates/ingress.yaml b/mod-source-record-manager/templates/ingress.yaml index 89e1ceef..81c40c69 100644 --- a/mod-source-record-manager/templates/ingress.yaml +++ b/mod-source-record-manager/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-source-record-storage/templates/ingress.yaml b/mod-source-record-storage/templates/ingress.yaml index 2f4cb43b..00bd9c5b 100644 --- a/mod-source-record-storage/templates/ingress.yaml +++ b/mod-source-record-storage/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-tags/templates/ingress.yaml b/mod-tags/templates/ingress.yaml index 7e4aadd4..e476a4d5 100644 --- a/mod-tags/templates/ingress.yaml +++ b/mod-tags/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-template-engine/templates/ingress.yaml b/mod-template-engine/templates/ingress.yaml index fd9e0c03..67f356f2 100644 --- a/mod-template-engine/templates/ingress.yaml +++ b/mod-template-engine/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-user-import/templates/ingress.yaml b/mod-user-import/templates/ingress.yaml index 058feddc..d89a5ba1 100644 --- a/mod-user-import/templates/ingress.yaml +++ b/mod-user-import/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-users-bl/templates/ingress.yaml b/mod-users-bl/templates/ingress.yaml index febb44c7..cc64539c 100644 --- a/mod-users-bl/templates/ingress.yaml +++ b/mod-users-bl/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/mod-users/templates/ingress.yaml b/mod-users/templates/ingress.yaml index 6021282f..8970609c 100644 --- a/mod-users/templates/ingress.yaml +++ b/mod-users/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/okapi/templates/ingress.yaml b/okapi/templates/ingress.yaml index 610ae05e..250d029d 100644 --- a/okapi/templates/ingress.yaml +++ b/okapi/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/pgadmin4/templates/ingress.yaml b/pgadmin4/templates/ingress.yaml index d12c3115..7dbdc9a2 100644 --- a/pgadmin4/templates/ingress.yaml +++ b/pgadmin4/templates/ingress.yaml @@ -28,9 +28,12 @@ spec: paths: {{- range .paths }} - path: {{ . }} + pathType: ImplementationSpecific backend: - serviceName: {{ $fullName }} - servicePort: http + service: + name: {{ $fullName }} + port: + name: http {{- end }} {{- end }} {{- end }} diff --git a/platform-complete/templates/ingress.yaml b/platform-complete/templates/ingress.yaml index a54b12de..225f190b 100644 --- a/platform-complete/templates/ingress.yaml +++ b/platform-complete/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }} diff --git a/platform-core/templates/ingress.yaml b/platform-core/templates/ingress.yaml index d4f1d0cf..f9ec6821 100644 --- a/platform-core/templates/ingress.yaml +++ b/platform-core/templates/ingress.yaml @@ -34,10 +34,20 @@ spec: http: paths: {{- range .paths }} - - path: {{ . }} + - path: {{ .path }} + {{- if and .pathType (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: {{ .pathType }} + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: {{ $fullName }} + port: + number: {{ $svcPort }} + {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} + {{- end }} {{- end }} {{- end }} {{- end }}