From 5c303961b407c1c3564d6d84b786fa0ec1681d93 Mon Sep 17 00:00:00 2001
From: Markus Scheidgen <markus.scheidgen@gmail.com>
Date: Mon, 28 Jan 2019 14:46:26 +0100
Subject: [PATCH] Some refactored names.
---
.gitlab-ci.yml | 19 +++++++++++++++----
ops/helm/nomad/values.yaml | 13 ++++++-------
2 files changed, 21 insertions(+), 11 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eaafce5b30..bdc8462a10 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -209,11 +209,22 @@ deploy_kubernetes:
- cd ops/helm/nomad
- export KUBECONFIG=/etc/deploy/config
- helm dep build
- - export API_VERSION="$(grep "version" Chart.yaml | cut -d" " -f2)"
- - export RELEASE_NAME="nomad-v${API_VERSION//./-}"
+ - export NOMAD_VERSION="$(grep "version" Chart.yaml | cut -d" " -f2)"
+ - export NUMERIC_VERSION="$(echo ${NOMAD_VERSION} | cut -d"." -f1-2)"
+ - export RELEASE_NAME="nomad-v${NOMAD_VERSION//./-}"
- export DEPLOYS=$(helm ls | grep $RELEASE_NAME | wc -l)
- - export EXTERNAL_PATH="/nomad/kubetest/v${API_VERSION}"
- - if [ ${DEPLOYS} -eq 0 ]; then helm install --name=${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE} --set proxy.external.path=${EXTERNAL_PATH}; else helm upgrade ${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE}; fi
+ - export EXTERNAL_PATH="/fairdi/nomad/v${NOMAD_VERSION}"
+ - export DBNAME="fairdi_nomad_v${NOMAD_VERSION//./_}"
+ - export FILES_PATH="/scratch/nomad-fair/fs/nomad_v${NOMAD_VERSION}"
+ - if [ ${DEPLOYS} -eq 0 ]; then \
+ helm install --name=${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE} \
+ --set proxy.nodePort="300${NUMERIC_VERSION//./}"
+ --set proxy.external.path=${EXTERNAL_PATH} \
+ --set dbname=${DBNAME} \
+ --set volumes.files=${FILES_PATH}; \
+ else \
+ helm upgrade ${RELEASE_NAME} . --namespace=${STAGING_NAMESPACE}; \
+ fi
# except:
# - /^dev-.*$/
when: manual
diff --git a/ops/helm/nomad/values.yaml b/ops/helm/nomad/values.yaml
index 496f6a7dca..a170d86863 100644
--- a/ops/helm/nomad/values.yaml
+++ b/ops/helm/nomad/values.yaml
@@ -53,13 +53,12 @@ gui:
# It is run via NodePort service
proxy:
port: 80
- nodePort: 30001
+ nodePort: 30003
nodeIP: 130.183.207.116
external:
- host: "localhost"
- port: 30001
- ## Add a path segment with the release name to path, e.g. /nomad/liquid-thunder/...
- path: "/nomad/kubetest"
+ host: "enc-staging-nomad.esc.rzg.mpg.de"
+ port: 80
+ path: "/fairdi/nomad"
## configuration of the chart dependency for rabbitmq
rabbitmq:
@@ -70,7 +69,7 @@ rabbitmq:
erlangCookie: SWQOKODSQALRPCLNMEQG
## A common name/prefix for all dbs and indices.
-dbname: nomad_kubetest
+dbname: fairdi_nomad
## Databases that are not run within the cluster.
# To run databases in the cluster, use the nomad-full helm chart.
@@ -96,4 +95,4 @@ kibana:
## Everything concerning the data that is used by the service
volumes:
- files: /scratch/nomad-fair/fs/kubetest
+ files: /scratch/nomad-fair/fs
--
GitLab