From 616a86dc0422004a351f0e8a8f7190995b0fea2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20=20LAURENT?= <francois.laurent@pasteur.fr>
Date: Thu, 23 Jan 2025 14:48:01 +0100
Subject: [PATCH] Update 2 files
- /nyxui/templates/ingress.yaml
- /.gitlab-ci.yml
---
.gitlab-ci.yml | 4 ++--
nyxui/templates/ingress.yaml | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 61b586f..4bcd630 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 6a2749e..79522d8 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 }}
--
GitLab