From 41ef11aab3682645a59db039c3a2a7a0ae99598c Mon Sep 17 00:00:00 2001
From: Gareth Evans <gareth@bryncynfelin.co.uk>
Date: Fri, 26 Feb 2021 12:22:40 +0000
Subject: [PATCH 1/3] chore: update ingress for 1.19

---
 charts/captain-hook/templates/ingress.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/charts/captain-hook/templates/ingress.yaml b/charts/captain-hook/templates/ingress.yaml
index e3ae860..f572ba9 100644
--- a/charts/captain-hook/templates/ingress.yaml
+++ b/charts/captain-hook/templates/ingress.yaml
@@ -36,8 +36,15 @@ spec:
           {{- range .paths }}
           - path: {{ .path }}
             backend:
+              {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+              service:
+                name: {{ $fullName }}
+                port:
+                  number: {{ $svcPort }}
+              {{- else -}}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
+              {{- end }}
           {{- end }}
     {{- end }}
   {{- end }}

From f7dbb0f433398784ee1f55d6ca9986f6730e30ab Mon Sep 17 00:00:00 2001
From: Gareth Evans <gareth@bryncynfelin.co.uk>
Date: Fri, 26 Feb 2021 12:33:10 +0000
Subject: [PATCH 2/3] chore: enabling ingress for tests

---
 charts/captain-hook/values.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/captain-hook/values.yaml b/charts/captain-hook/values.yaml
index b5789bc..d819e91 100644
--- a/charts/captain-hook/values.yaml
+++ b/charts/captain-hook/values.yaml
@@ -45,7 +45,7 @@ service:
   port: 8080
 
 ingress:
-  enabled: false
+  enabled: true
   annotations: {}
     # kubernetes.io/ingress.class: nginx
     # kubernetes.io/tls-acme: "true"

From 4a6286b1561e16f56a74cc0a84aaa9e5b8fe8295 Mon Sep 17 00:00:00 2001
From: Gareth Evans <gareth@bryncynfelin.co.uk>
Date: Fri, 26 Feb 2021 12:46:16 +0000
Subject: [PATCH 3/3] chore: different ingress templates for versions

---
 charts/captain-hook/templates/ingress.yaml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/charts/captain-hook/templates/ingress.yaml b/charts/captain-hook/templates/ingress.yaml
index f572ba9..0b348bb 100644
--- a/charts/captain-hook/templates/ingress.yaml
+++ b/charts/captain-hook/templates/ingress.yaml
@@ -1,9 +1,10 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "captain-hook.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- $kubeTargetVersion := default .Capabilities.KubeVersion.GitVersion .Values.kubeTargetVersionOverride }}
+{{- if semverCompare ">=1.19-0" $kubeTargetVersion -}}
 apiVersion: networking.k8s.io/v1
-{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
+{{- else if semverCompare ">=1.14-0" $kubeTargetVersion -}}
 apiVersion: networking.k8s.io/v1beta1
 {{- else -}}
 apiVersion: extensions/v1beta1
@@ -36,12 +37,12 @@ spec:
           {{- range .paths }}
           - path: {{ .path }}
             backend:
-              {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
+              {{- if semverCompare ">=1.19-0" $kubeTargetVersion }}
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
-              {{- else -}}
+              {{- else }}
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
               {{- end }}