diff --git a/chart/templates/cronjob-back-command.yaml b/chart/templates/cronjob-back-command.yaml index f1b0e9234b591160f7be7e50e303cd726d2600f3..6cd0ec164e3c56097869044989bbcd6891c33537 100644 --- a/chart/templates/cronjob-back-command.yaml +++ b/chart/templates/cronjob-back-command.yaml @@ -1,7 +1,7 @@ {{- $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 "-" }} diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index 991f2adcb88270d7b60abed0cb40c3d49e5526d8..16276e78d94653012c83073270867364e2a9fe68 100644 --- a/chart/templates/ingress.yaml +++ b/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 }} diff --git a/chart/templates/redirections.yaml b/chart/templates/redirections.yaml index 44ca7512fb5e922d38f360503c761c919c75eaaf..1ddb39fe73c727f2fb3fc1bd6f6ed74870b6ed5a 100644 --- a/chart/templates/redirections.yaml +++ b/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 }} diff --git a/chart/values.jass-prod.yaml b/chart/values.jass-prod.yaml index 8ae07f218795cccddf579323e94723d566df99b0..b5201834db06fd3fed94fabb9aafc1890345136e 100644 --- a/chart/values.jass-prod.yaml +++ b/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 diff --git a/chart/values.yaml b/chart/values.yaml index f70af91d3c9dd17f628f887956c18a92b94e8951..74055a68c908f7a0bc8529b62a237ef973aa9341 100644 --- a/chart/values.yaml +++ b/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