Skip to content
Snippets Groups Projects
Commit 111901cd authored by Bryan BRANCOTTE's avatar Bryan BRANCOTTE
Browse files

Merge branch 'use-dev-prod-values-for-helm' into 'master'

use namespace dependant values...yaml file

See merge request !57
parents df91ab3a 05d8e463
No related branches found
No related tags found
1 merge request!57use namespace dependant values...yaml file
......@@ -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"
......@@ -189,12 +186,10 @@ deploy-prod:
extends: .deploy
variables:
NAMESPACE: "jass-prod"
PUBLIC_URL: "jass.pasteur.cloud"
INGRESS_CLASS: "internal"
PROJECT_SIZE: "34Gi"
PUBLIC_URL: "jass-beta.pasteur.cloud"
environment:
name: "k8sprod-02/jass-prod/${CI_COMMIT_REF_SLUG}"
url: "https://jass.pasteur.cloud"
url: "https://jass-beta.pasteur.cloud"
delete-dev-deployment:
......
# this file is empty. All dev settings are in values.yaml
\ No newline at end of file
projects:
size: 34Gi # quota - 15Gi from pvc-shared-data.yaml - 1Gi for rabbitMQ
celery:
resources:
limits:
memory: 13Gi
ingress:
annotations:
kubernetes.io/ingress.class: external
\ No newline at end of file
......@@ -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
......@@ -52,7 +52,7 @@ ingress:
celery:
resources:
requests:
memory: 4Gi
memory: 2Gi
cpu: 1000m
limits:
memory: 12Gi
......
......@@ -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
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment