Merge branch 'update-ingress' into 'master'

Update ingress

See merge request statistical-genetics/jass!87

chart/templates/cronjob-back-command.yaml

 {{- $root := . -}}
 {{- range $task := .Values.backCronTasks.tasks }}
 ---
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: {{ printf "%s-%s" (include "chart.fullname" $root) (join "-" $task.command | replace "_" "-") | trunc 52 | trimSuffix "--" | trimSuffix "-" }}

chart/templates/ingress.yaml

@@ -11,6 +11,7 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
+  ingressClassName: {{ if and $.Values.publiclyOpen }}"external"{{ else }}"internal"{{ end }}
   {{- if .Values.ingress.tls }}
   tls:
     {{- range .Values.ingress.tls }}

chart/templates/redirections.yaml

@@ -8,7 +8,7 @@ metadata:
   annotations:
     nginx.ingress.kubernetes.io/temporal-redirect: "https://{{ $target }}"
 spec:
-  ingressClassName: external
+  ingressClassName: {{ if and $.Values.publiclyOpen }}"external"{{ else }}"internal"{{ end }}
   rules:
     - host: {{ . }}
 {{- end }}

chart/values.jass-prod.yaml

@@ -9,8 +9,8 @@ celery:
       cpu: 2
 
 ingress:
-  annotations:
-    kubernetes.io/ingress.class: external
   redirections:
     hosts:
-      - jass-beta.pasteur.cloud
\ No newline at end of file
+      - jass-beta.pasteur.cloud
+
+publiclyOpen: true

chart/values.yaml

@@ -44,18 +44,19 @@ ingress:
   enabled: true
   annotations:
     nginx.ingress.kubernetes.io/proxy-body-size: "10m"
-    kubernetes.io/ingress.class: internal
     # kubernetes.io/tls-acme: "true"
   host:
     name: chart-example.local
 
+publiclyOpen: false
+
 celery:
   resources:
     requests:
       memory: 2Gi
       cpu: 1000m
     limits:
-      memory: 12Gi
+      memory: 11Gi
       cpu: 1000m
   concurrency: 1
   maxTasksPerChild: 1