From 1a1b98991490b9b6ad2f2f4d1548d3bda99c11bc Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Tue, 7 Nov 2023 13:50:45 +0100
Subject: [PATCH] set meili master key as variable
---
.gitlab-ci.yml | 8 +++++---
deploy/df-wiki/values.production.yaml | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 95ae613d..0ce66324 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -105,7 +105,7 @@ build:dev:wiki:
variables:
BASE_URL: /wiki/
MEILI_HOST: 'https://defense-finder-meilisearch.dev.pasteur.cloud'
- MEILI_API_KEY: MASTER_KEY
+ MEILI_API_KEY: "${MEILI_MASTER_KEY}"
rules:
- if: $CI_COMMIT_BRANCH != "main"
@@ -115,7 +115,7 @@ build:prod:wiki:
variables:
BASE_URL: /wiki/
MEILI_HOST: 'https://defense-finder-meilisearch.pasteur.cloud'
- MEILI_API_KEY: MASTER_KEY
+ MEILI_API_KEY: "${MEILI_MASTER_KEY}"
rules:
- if: $CI_COMMIT_BRANCH == "main"
@@ -127,7 +127,6 @@ build:prod:wiki:
variables:
CI_DEBUG_TRACE: "false"
TEAM_ID: "df"
-
script:
- helm dependency update deploy/df-wiki/
- >
@@ -140,6 +139,8 @@ build:prod:wiki:
--set imagePullSecrets[0].name="registry-pull-secret-${CI_COMMIT_REF_SLUG}"
--set image.repository="$CI_REGISTRY_IMAGE/$IMAGE_NAME"
--set image.tag="$CI_COMMIT_SHORT_SHA"
+ --set meilisearch.environment.MEILI_MASTER_KEY="${MEILI_MASTER_KEY}"
+ --set meilisearch.environment.MEILI_ENV="${ENV}"
--set env="${ENV:-development}"
--values deploy/df-wiki/values.yaml
--values deploy/df-wiki/values.${ENV:-development}.yaml
@@ -175,6 +176,7 @@ deploy:prod:
PUBLIC_URL: "defense-finder.pasteur.cloud"
CI_DEBUG_TRACE: "false"
ENV: "production"
+
environment:
name: k8sprod-02
url: "https://defense-finder.pasteur.cloud"
diff --git a/deploy/df-wiki/values.production.yaml b/deploy/df-wiki/values.production.yaml
index 5bbb08c7..6db74bea 100644
--- a/deploy/df-wiki/values.production.yaml
+++ b/deploy/df-wiki/values.production.yaml
@@ -46,7 +46,7 @@ meilisearch:
resources:
limits:
cpu: 1500m
- memory: 2Gi
+ memory: "1.5Gi"
requests:
cpu: 1000m
memory: 1Gi
\ No newline at end of file
--
GitLab