diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e7a21b95a76cf6a62a70bc85b6ee077caf3ce5b8..631c2b75135051f6c0c1a1b42b1161c96a34337d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -154,7 +154,7 @@ build-client-prod: - cd client variables: PATH_TAG: client-static-serve - API_URL: "https://jass-beta.pasteur.cloud/api" + API_URL: "https://jass.pasteur.fr/api" @@ -223,10 +223,10 @@ deploy-prod: extends: .deploy variables: NAMESPACE: "jass-prod" - PUBLIC_URL: "jass-beta.pasteur.cloud" + PUBLIC_URL: "jass.pasteur.fr" environment: name: "k8sprod-02/jass-prod/${CI_COMMIT_REF_SLUG}" - url: "https://jass-beta.pasteur.cloud" + url: "https://jass.pasteur.fr" delete-dev-deployment: diff --git a/chart/templates/redirections.yaml b/chart/templates/redirections.yaml new file mode 100644 index 0000000000000000000000000000000000000000..2173c81bc5f12b78680133a373222798ab5d0a3f --- /dev/null +++ b/chart/templates/redirections.yaml @@ -0,0 +1,15 @@ +{{- if .Values.ingress.redirections -}} +{{- $target := .Values.ingress.host.name -}} +{{- range .Values.ingress.redirections.hosts }} +kind: Ingress +apiVersion: networking.k8s.io/v1beta1 +metadata: + name: {{ printf "redirect-from-%s" . | replace "." "-" | trunc 63 | trimSuffix "-" | quote }} + annotations: + nginx.ingress.kubernetes.io/temporal-redirect: {{ $target }} +spec: + ingressClassName: external + rules: + - host: {{ . }} +{{- end }} +{{- end }} diff --git a/chart/values.jass-prod.yaml b/chart/values.jass-prod.yaml index fd9e8dc4931123cf6b8bedc3164981ab806471ea..8ae07f218795cccddf579323e94723d566df99b0 100644 --- a/chart/values.jass-prod.yaml +++ b/chart/values.jass-prod.yaml @@ -10,4 +10,7 @@ celery: ingress: annotations: - kubernetes.io/ingress.class: external \ No newline at end of file + kubernetes.io/ingress.class: external + redirections: + hosts: + - jass-beta.pasteur.cloud \ No newline at end of file