Merge pull request #25 from garethjevans/kind-version

chore: bump kind to 1.19.1
jenkins-infra · Feb 26, 2021 · 906718e · 906718e
2 parents 7268161 + 402ed66
commit 906718e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -126,6 +126,8 @@ jobs:
       - name: Create kind cluster
         uses: helm/kind-action@v1.0.0
         if: steps.list-changed.outputs.changed == 'true'
+        with:
+          node_image: kindest/node:v1.19.1
 
       - name: Run chart-testing (install)
         run: ct install --config ct.yaml

diff --git a/charts/captain-hook/templates/ingress.yaml b/charts/captain-hook/templates/ingress.yaml
@@ -36,16 +36,18 @@ spec:
         paths:
           {{- range .paths }}
           - path: {{ .path }}
+            {{- if semverCompare ">=1.19-0" $kubeTargetVersion }}
             backend:
-              {{- if semverCompare ">=1.19-0" $kubeTargetVersion }}
               service:
                 name: {{ $fullName }}
                 port:
                   number: {{ $svcPort }}
-              {{- else }}
+            pathType: ImplementationSpecific
+            {{- else }}
+            backend:
               serviceName: {{ $fullName }}
               servicePort: {{ $svcPort }}
-              {{- end }}
+            {{- end }}
           {{- end }}
     {{- end }}
   {{- end }}