Relative paths for gui deployment. Common dbname instead of relase name.

.gitlab-ci.yml

@@ -41,7 +41,7 @@ buildgui:
     - ./gitinfo.sh
     - ls -la src/gitinfo.json
     - docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN gitlab-registry.mpcdf.mpg.de
-    - docker build -t $FRONTEND_TEST_IMAGE --build-arg public_url=http://example.com/nomad/$CI_COMMIT_REF_NAME .
+    - docker build -t $FRONTEND_TEST_IMAGE
     - docker push $FRONTEND_TEST_IMAGE
   except:
     - /^dev-.*$/

gui/Dockerfile

@@ -28,8 +28,6 @@ COPY yarn.lock /nomad/app/yarn.lock
 RUN yarn
 COPY . /nomad/app
 
-ARG public_url=http://example.com/nomad
-ENV PUBLIC_URL $public_url
 RUN yarn run build
 
 # production environment

gui/package.json

@@ -40,5 +40,5 @@
     "eslint-plugin-standard": "^3.1.0",
     "serve": "^10.0.0"
   },
-  "homepage": "http://mywebsite.com/nomad"
+  "homepage": "."
 }

ops/helm/nomad/templates/api-deployment.yaml

@@ -53,19 +53,19 @@ spec:
         - name: NOMAD_ELASTIC_PORT
           value: "{{ .Values.elastic.port }}"
         - name: NOMAD_ELASTIC_INDEX_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_MONGO_HOST
           value: "{{ .Values.mongo.host }}"
         - name: NOMAD_MONGO_PORT
           value: "{{ .Values.mongo.port }}"
         - name: NOMAD_MONGO_DB_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_COE_REPO_DB_HOST
           value: "{{ .Values.postgres.host }}"
         - name: NOMAD_COE_REPO_DB_PORT
           value: "{{ .Values.postgres.port }}"
         - name: NOMAD_COE_REPO_DB_NAME
-          value: "{{ .Release.Name }}_nomad"
+          value: "{{ .Values.dbname }}"
         command: ["python", "-m", "gunicorn.app.wsgiapp", "-b 0.0.0.0:8000", "nomad.api:app"]
       imagePullSecrets:
       - name: {{ .Values.images.secret }}

ops/helm/nomad/templates/worker-deployment.yaml

@@ -45,19 +45,19 @@ spec:
         - name: NOMAD_ELASTIC_PORT
           value: "{{ .Values.elastic.port }}"
         - name: NOMAD_ELASTIC_INDEX_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_MONGO_HOST
           value: "{{ .Values.mongo.host }}"
         - name: NOMAD_MONGO_PORT
           value: "{{ .Values.mongo.port }}"
         - name: NOMAD_MONGO_DB_NAME
-          value: "{{ .Release.Name }}-nomad"
+          value: "{{ .Values.dbname }}"
         - name: NOMAD_COE_REPO_DB_HOST
           value: "{{ .Values.postgres.host }}"
         - name: NOMAD_COE_REPO_DB_PORT
           value: "{{ .Values.postgres.port }}"
         - name: NOMAD_COE_REPO_DB_NAME
-          value: "{{ .Release.Name }}_nomad"
+          value: "{{ .Values.dbname }}"
         command: ["python", "-m", "celery", "worker", "-l", "info", "-A", "nomad.processing"]
       imagePullSecrets:
       - name: {{ .Values.images.secret }}

ops/helm/nomad/values.yaml

@@ -65,6 +65,9 @@ rabbitmq:
     password: rabbitmq
     erlangCookie: SWQOKODSQALRPCLNMEQG
 
+## A common name/prefix for all dbs and indices.
+dbname: nomad_kubetest
+
 ## Databases that are not run within the cluster.
 #  To run databases in the cluster, use the nomad-full helm chart.
 mongo: