Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
nomad-lab
nomad-FAIR
Commits
7b8dea01
Commit
7b8dea01
authored
Jul 03, 2020
by
Lauri Himanen
Browse files
Updated encyclopedia gui and the helm template to use global configuration file.
parent
59725148
Pipeline
#77771
passed with stages
in 27 minutes and 17 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
encyclopedia-gui
@
40bd6703
Compare
0fc62348
...
40bd6703
Subproject commit
0fc6234876cfc91e84f95005aa41df6e6317a6ce
Subproject commit
40bd67030256126a66d623cc5a0568fcab06b294
ops/helm/nomad/templates/api-deployment.yaml
View file @
7b8dea01
...
...
@@ -96,6 +96,24 @@ data:
"debug": {{ .Values.gui.debug }}
};
---
apiVersion
:
v1
kind
:
ConfigMap
metadata
:
name
:
{{
include "nomad.fullname" .
}}
-enc-conf-js
labels
:
app.kubernetes.io/name
:
{{
include "nomad.name" .
}}
-enc-conf-js
helm.sh/chart
:
{{
include "nomad.chart" .
}}
app.kubernetes.io/instance
:
{{
.Release.Name
}}
app.kubernetes.io/managed-by
:
{{
.Release.Service
}}
data
:
conf.js
:
|
window.nomadEnv = {
host: "https://{{ .Values.proxy.external.host }}{{ .Values.proxy.external.path }}",
userCookieDomain: ".{{ .Values.proxy.external.host }}",
guestUserToken: 'eyJhbGciOiJIUzI1NiIsImlhdCI6MTUyMzg4MDE1OSwiZXhwIjoxNjgxNTYwMTU5fQ.ey'+
'JpZCI6ImVuY2d1aSJ9.MsMWQa3IklH7cQTxRaIRSF9q8D_2LD5Fs2-irpWPTp4'
};
---
apiVersion
:
apps/v1
kind
:
Deployment
metadata
:
...
...
@@ -145,6 +163,10 @@ spec:
readOnly
:
true
subPath
:
env.js
name
:
gui-env-js
-
mountPath
:
/app/dependencies/encyclopedia-gui/client/conf.js
readOnly
:
true
subPath
:
conf.js
name
:
enc-conf-js
env
:
-
name
:
NOMAD_SERVICE
value
:
"
app"
...
...
@@ -224,6 +246,9 @@ spec:
-
name
:
gui-env-js
configMap
:
name
:
{{
include "nomad.fullname" .
}}
-gui-env-js
-
name
:
enc-conf-js
configMap
:
name
:
{{
include "nomad.fullname" .
}}
-enc-conf-js
-
name
:
public-volume
hostPath
:
path
:
{{
.Values.volumes.public
}}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment