From 599af8012d0426afa3d4f40a96688f4d6f5d3c3b Mon Sep 17 00:00:00 2001
From: Bryan Brancotte <bryan.brancotte@pasteur.fr>
Date: Mon, 25 Apr 2022 14:26:22 +0200
Subject: [PATCH] use namespace dependant values...yaml file set project size
and ingress class in such files
---
.gitlab-ci.yml | 7 +------
chart/values.jass-dev.yaml | 1 +
chart/values.jass-prod.yaml | 2 ++
chart/values.yaml | 2 +-
dohelm.sh | 3 +--
5 files changed, 6 insertions(+), 9 deletions(-)
create mode 100644 chart/values.jass-dev.yaml
create mode 100644 chart/values.jass-prod.yaml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 311499f3..32a11da1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -157,14 +157,13 @@ build-client:
--set CI_REGISTRY_IMAGE=${CI_REGISTRY_IMAGE}
--set image.tag=${CI_COMMIT_SHA}
--set ingress.host.name=${PUBLIC_URL}
- --set ingress.annotations."kubernetes\.io/ingress\.class"=${INGRESS_CLASS}
--set registry.username=${DEPLOY_USER}
--set registry.password=${DEPLOY_TOKEN}
--set registry.host=${CI_REGISTRY}
--set imagePullSecrets[0].name="registry-pull-secret-${CI_COMMIT_REF_SLUG}"
--set rabbitmq.auth.password=$RABBITMQ_PASSWORD
--set rabbitmq.auth.erlangCookie=$RABBITMQ_ERLANG_COOKIE
- --set projects.size=${PROJECT_SIZE}
+ --values ./chart/values.${NAMESPACE}.yaml
${CI_COMMIT_REF_SLUG} ./chart/
@@ -174,8 +173,6 @@ deploy-dev:
variables:
NAMESPACE: "jass-dev"
PUBLIC_URL: "jass-${CI_COMMIT_REF_SLUG}.dev.pasteur.cloud"
- INGRESS_CLASS: "internal"
- PROJECT_SIZE: "20Gi"
environment:
name: "k8sdev-01/jass-dev/${CI_COMMIT_REF_SLUG}"
url: "https://jass-${CI_COMMIT_REF_SLUG}.dev.pasteur.cloud"
@@ -190,8 +187,6 @@ deploy-prod:
variables:
NAMESPACE: "jass-prod"
PUBLIC_URL: "jass.pasteur.cloud"
- INGRESS_CLASS: "internal"
- PROJECT_SIZE: "34Gi"
environment:
name: "k8sprod-02/jass-prod/${CI_COMMIT_REF_SLUG}"
url: "https://jass.pasteur.cloud"
diff --git a/chart/values.jass-dev.yaml b/chart/values.jass-dev.yaml
new file mode 100644
index 00000000..997e5dbe
--- /dev/null
+++ b/chart/values.jass-dev.yaml
@@ -0,0 +1 @@
+# this file is empty. All dev settings are in values.yaml
\ No newline at end of file
diff --git a/chart/values.jass-prod.yaml b/chart/values.jass-prod.yaml
new file mode 100644
index 00000000..ae445b84
--- /dev/null
+++ b/chart/values.jass-prod.yaml
@@ -0,0 +1,2 @@
+projects:
+ size: 34Gi
\ No newline at end of file
diff --git a/chart/values.yaml b/chart/values.yaml
index 46ff54b4..fd199380 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -44,7 +44,7 @@ ingress:
enabled: true
annotations:
nginx.ingress.kubernetes.io/proxy-body-size: "10m"
- # kubernetes.io/ingress.class: nginx
+ kubernetes.io/ingress.class: internal
# kubernetes.io/tls-acme: "true"
host:
name: chart-example.local
diff --git a/dohelm.sh b/dohelm.sh
index ddefd344..9a98dda5 100755
--- a/dohelm.sh
+++ b/dohelm.sh
@@ -12,7 +12,6 @@ CI_REGISTRY_IMAGE="${CI_REGISTRY}/statistical-genetics/jass"
CI_COMMIT_SHA=$(git log --format="%H" -n 1)
#CI_COMMIT_SHA="8e1c38c0b93cbf5144a30d990a1bea29c0fcb0f0"
CI_COMMIT_REF_SLUG=$(git branch --show)
-INGRESS_CLASS="internal"
PUBLIC_URL="jass-${CI_COMMIT_REF_SLUG}.dev.pasteur.cloud"
PUBLIC_URL_2="jass.pasteur.fr"
@@ -27,11 +26,11 @@ helm ${ACTION} --namespace=${NAMESPACE} \
--set CI_REGISTRY_IMAGE=${CI_REGISTRY_IMAGE} \
--set image.tag=${CI_COMMIT_SHA} \
--set ingress.host.name=${PUBLIC_URL} \
- --set ingress.annotations."kubernetes\.io/ingress\.class"=${INGRESS_CLASS} \
--set registry.username=${DEPLOY_USER} \
--set registry.password=${DEPLOY_TOKEN} \
--set registry.host=${CI_REGISTRY} \
--set imagePullSecrets[0].name="registry-pull-secret-${CI_COMMIT_REF_SLUG}" \
--set rabbitmq.auth.password=$RABBITMQ_PASSWORD \
--set rabbitmq.auth.erlangCookie=$RABBITMQ_ERLANG_COOKIE \
+ --values ./chart/values.${NAMESPACE}.yaml \
${CI_COMMIT_REF_SLUG} ./chart/
\ No newline at end of file
--
GitLab