diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 18ddf3f2a69999e698b9ffeb948740c5ce73ddaf..61b586f18408a53b3cb1623f37835b09bb4ec0a9 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 71c9bc07c3119286a913e8c18a0d0befbe76f8a8..cfb608982a79fa53ab5cca846b1a30894c6d272a 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 dcd9efadd04e8a49bd6f38651e5385657e315a7b..df2c516be9a5e2fe3f1a5f04401c819253d74083 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: