From f222150ced43b47a22673d576303672ec8b577ad 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:24:55 +0100
Subject: [PATCH] nyx.pasteur.cloud to external
---
.gitlab-ci.yml | 9 +++++----
nyxui/values.yaml | 2 +-
values-yaml.gotmpl | 2 +-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 18ddf3f..61b586f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,17 +83,18 @@ build dev on gitlab.pasteur.fr:
deploy to pasteur.cloud:
extends: .deploy-with-helm
variables:
- IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui.jl/front"
+ IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui/front"
SERVICE_TARGET_PORT: "8080"
IMAGE_SECRETS: "registry-gitlab"
KUBE_NAMESPACE: "nyx-prod"
PUBLIC_URL: "nyx.pasteur.cloud"
- INGRESS_CLASS: "internal"
+ INGRESS_CLASS: "external"
INGRESS_URL: "nyx.pasteur.cloud"
SERVICE_PORT: "80"
LIMITS_CPU: "2"
LIMITS_MEMORY: "4Gi"
LIMITS_STORAGE: "1Gi"
+ IMAGE_POLICY: "Always"
environment:
name: k8sprod-02/nyx-prod
url: https://nyx.pasteur.cloud
@@ -104,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.jl/front"
+ IMAGE_URL: "registry-gitlab.pasteur.fr/nyx/nyxui/front"
SERVICE_TARGET_PORT: "8080"
IMAGE_SECRETS: "registry-gitlab"
KUBE_NAMESPACE: "nyx-dev"
@@ -115,10 +116,10 @@ deploy to dev.pasteur.cloud:
LIMITS_CPU: "2"
LIMITS_MEMORY: "4Gi"
LIMITS_STORAGE: "1Gi"
+ IMAGE_POLICY: "Always"
environment:
name: k8sdev-01/nyx-dev
url: https://nyx.dev.pasteur.cloud
rules:
- if: $CI_COMMIT_BRANCH == "dev"
when: manual
-
diff --git a/nyxui/values.yaml b/nyxui/values.yaml
index 71c9bc0..cfb6089 100644
--- a/nyxui/values.yaml
+++ b/nyxui/values.yaml
@@ -7,7 +7,7 @@ replicaCount: 1
front:
image:
repository: registry-gitlab.pasteur.fr/nyx/nyxui.jl/front
- pullPolicy: IfNotPresent
+ pullPolicy: Always
# Overrides the image tag whose default is the chart appVersion.
tag: ""
service:
diff --git a/values-yaml.gotmpl b/values-yaml.gotmpl
index dcd9efa..df2c516 100644
--- a/values-yaml.gotmpl
+++ b/values-yaml.gotmpl
@@ -7,7 +7,7 @@ replicaCount: 1
front:
image:
repository: {{ requiredEnv "IMAGE_URL" }}
- pullPolicy: IfNotPresent
+ pullPolicy: {{ requiredEnv "IMAGE_POLICY" }}
# Overrides the image tag whose default is the chart appVersion.
tag: ""
service:
--
GitLab