Update ingress and cronJob apiVersions

Related to AWS Setup Guide / Example #15 (#15 (comment))
juice-shop · Oct 8, 2021 · 85f467a · 85f467a
1 parent 579a1a0
commit 85f467a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/helm/multi-juicer/templates/cleanup-cron-job.yaml b/helm/multi-juicer/templates/cleanup-cron-job.yaml
@@ -1,5 +1,5 @@
 {{- if .Values.juiceShopCleanup.enabled -}}
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: 'cleanup-job'

diff --git a/helm/multi-juicer/templates/juice-balancer-ingress.yaml b/helm/multi-juicer/templates/juice-balancer-ingress.yaml
@@ -1,11 +1,7 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "multi-juicer.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
-{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
-apiVersion: networking.k8s.io/v1beta1
-{{- else -}}
-apiVersion: extensions/v1beta1
-{{- end }}
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -33,9 +29,12 @@ spec:
         paths:
         {{- range .paths }}
           - path: {{ . }}
+            pathType: ImplementationSpecific
             backend:
-              serviceName: juice-balancer
-              servicePort: {{ $svcPort }}
+              service:
+                name: juice-balancer
+                port: 
+                  number: {{ $svcPort }}
         {{- end }}
   {{- end }}
 {{- end }}