From 17441f5497d1868cd086645c1da6203f690a7c2b Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Thu, 9 Nov 2023 11:35:27 +0100
Subject: [PATCH] use public url env var to define ingress host
---
.gitlab-ci.yml | 3 ++-
deploy/meilisearch/templates/serviceaccount.yaml | 12 ------------
2 files changed, 2 insertions(+), 13 deletions(-)
delete mode 100644 deploy/meilisearch/templates/serviceaccount.yaml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index be1cd919..dde3c933 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,7 @@ stages:
${CI_PROJECT_NAME}-${CI_ENVIRONMENT_NAME}-meilisearch
./deploy/meilisearch
--namespace=${KUBE_NAMESPACE}
- --set meilisearch.ingress.hosts[0]=${CI_ENVIRONMENT_URL}
+ --set meilisearch.ingress.hosts[0]=${PUBLIC_URL}
--set meilisearch.environment.MEILI_MASTER_KEY=${MEILI_MASTER_KEY}
--set env=${ENV:-development}
--values deploy/meilisearch/values.yaml
@@ -64,6 +64,7 @@ deploy:meilisearch:dev:
variables:
CI_DEBUG_TRACE: "true"
ENV: "development"
+ PUBLIC_URL: "defense-finder-meilisearch.dev.pasteur.cloud"
environment:
name: k8sdev-01
url: "https://defense-finder-meilisearch.dev.pasteur.cloud"
diff --git a/deploy/meilisearch/templates/serviceaccount.yaml b/deploy/meilisearch/templates/serviceaccount.yaml
deleted file mode 100644
index d8f11265..00000000
--- a/deploy/meilisearch/templates/serviceaccount.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-{{- if .Values.serviceAccount.create -}}
-apiVersion: v1
-kind: ServiceAccount
-metadata:
- name: {{ include "meilisearch.serviceAccountName" . }}
- labels:
- {{- include "meilisearch.labels" . | nindent 4 }}
- {{- with .Values.serviceAccount.annotations }}
- annotations:
- {{- toYaml . | nindent 4 }}
- {{- end }}
-{{- end }}
--
GitLab