diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 61b586f18408a53b3cb1623f37835b09bb4ec0a9..4bcd6304d3813d6bd95d4cca06889bd9a0ebcb63 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -83,7 +83,7 @@ build dev on gitlab.pasteur.fr: deploy to pasteur.cloud: extends: .deploy-with-helm variables: - IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui/front" + IMAGE_URL: "$CI_REGISTRY_IMAGE/front:$CI_COMMIT_SHORT_SHA" SERVICE_TARGET_PORT: "8080" IMAGE_SECRETS: "registry-gitlab" KUBE_NAMESPACE: "nyx-prod" @@ -105,7 +105,7 @@ deploy to pasteur.cloud: deploy to dev.pasteur.cloud: extends: .deploy-with-helm variables: - IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui/front" + IMAGE_URL: "$CI_REGISTRY_IMAGE/front:$CI_COMMIT_SHORT_SHA" SERVICE_TARGET_PORT: "8080" IMAGE_SECRETS: "registry-gitlab" KUBE_NAMESPACE: "nyx-dev" diff --git a/nyxui/templates/ingress.yaml b/nyxui/templates/ingress.yaml index 6a2749ed80aaa8c139287b18ab85ee31ec62f117..79522d81581951e662142e67a07a2f658f1dbbc0 100644 --- a/nyxui/templates/ingress.yaml +++ b/nyxui/templates/ingress.yaml @@ -49,11 +49,11 @@ spec: backend: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: - name: {{ $fullName }}-front + name: {{ $fullName }} port: number: {{ $svcPort }} {{- else }} - serviceName: {{ $fullName }}-front + serviceName: {{ $fullName }} servicePort: {{ $svcPort }} {{- end }} {{- end }}