Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
container-manager
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
nomad-lab
container-manager
Commits
89c7c235
Commit
89c7c235
authored
6 years ago
by
Mohamed, Fawzi Roberto (fawzi)
Browse files
Options
Downloads
Patches
Plain Diff
anolytics-toolkit deploy fixes and tsl fixes
parent
c4fdeab0
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
config/analytics-toolkit.hjson
+19
-0
19 additions, 0 deletions
config/analytics-toolkit.hjson
config/default.hjson
+0
-2
0 additions, 2 deletions
config/default.hjson
config/labdev-nomad.hjson
+2
-0
2 additions, 0 deletions
config/labdev-nomad.hjson
deploy.sh
+5
-5
5 additions, 5 deletions
deploy.sh
with
26 additions
and
7 deletions
config/analytics-toolkit.hjson
+
19
−
0
View file @
89c7c235
...
@@ -6,4 +6,23 @@
...
@@ -6,4 +6,23 @@
}
}
frontendAddr: "https://analytics-toolkit.nomad-coe.eu"
frontendAddr: "https://analytics-toolkit.nomad-coe.eu"
}
}
passport: {
strategy: "saml"
saml: {
path: "/login/callback"
entryPoint: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
issuer: "https://analytics-toolkit.nomad-coe.eu/shibboleth"
identifierFormat: null
# logoutUrl: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
# logoutCallback: undefined
acceptedClockSkewMs: -1
}
}
mongoDb: {
url: "mongodb://notebook-info-db-mongodb/filedatabase"
}
session_redis: {
port: 6390,
host: 'analytics-toolkit.nomad-coe.eu'
}
}
}
This diff is collapsed.
Click to expand it.
config/default.hjson
+
0
−
2
View file @
89c7c235
...
@@ -42,8 +42,6 @@ passport: {
...
@@ -42,8 +42,6 @@ passport: {
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
identifierFormat: null
identifierFormat: null
acceptedClockSkewMs: -1
acceptedClockSkewMs: -1
logoutUrl: undefined
logoutCallback: undefined
}
}
},
},
k8component: {
k8component: {
...
...
This diff is collapsed.
Click to expand it.
config/labdev-nomad.hjson
+
2
−
0
View file @
89c7c235
...
@@ -13,6 +13,8 @@
...
@@ -13,6 +13,8 @@
entryPoint: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
entryPoint: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
issuer: "https://labdev-nomad.esc.rzg.mpg.de/shibboleth"
identifierFormat: null
identifierFormat: null
# logoutUrl: "https://idp.nomad-coe.eu/idp/profile/SAML2/Redirect/SSO"
# logoutCallback: undefined
acceptedClockSkewMs: -1
acceptedClockSkewMs: -1
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
deploy.sh
+
5
−
5
View file @
89c7c235
...
@@ -220,10 +220,10 @@ fi
...
@@ -220,10 +220,10 @@ fi
echo
"# password secret"
echo
"# password secret"
echo
" kubectl create secret generic analytics-session-db --from-file=redis-password=session-db-redis-pwd.txt"
echo
" kubectl create secret generic analytics-session-db --from-file=redis-password=session-db-redis-pwd.txt"
echo
"# actual redis setup"
echo
"# actual redis setup"
echo
" if ! [[ -n
\"\$
(helm ls analytics-session-db | grep -E '^analytics-session-db
\s
' )
\"
]]; then"
echo
" if ! [[ -n
\"\$
(helm ls
$tls
analytics-session-db | grep -E '^analytics-session-db
\s
' )
\"
]]; then"
echo
" helm
$tls
install --name analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo
" helm install
$tls
--name analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo
" else"
echo
" else"
echo
" helm
$tls
upgrade analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo
" helm upgrade
$tls
analytics-session-db -f session-redis-helm-values.yaml stable/redis"
echo
" fi"
echo
" fi"
...
@@ -253,7 +253,7 @@ echo "# password secret"
...
@@ -253,7 +253,7 @@ echo "# password secret"
echo
" kubectl create secret generic notebook-db-mongo-pwd --from-literal=database=notebookinfo --from-literal=user=notebookinfo --from-file=password=notebook-db-mongo-pwd.txt"
echo
" kubectl create secret generic notebook-db-mongo-pwd --from-literal=database=notebookinfo --from-literal=user=notebookinfo --from-file=password=notebook-db-mongo-pwd.txt"
echo
"# actual mongo setup"
echo
"# actual mongo setup"
echo
" if ! [[ -n
\"\$
(helm ls notebook-info-db | grep -E '^notebook-info-db
\s
' )
\"
]]; then"
echo
" if ! [[ -n
\"\$
(helm ls
$tls
notebook-info-db | grep -E '^notebook-info-db
\s
' )
\"
]]; then"
echo
" helm install
$tls
--name notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
echo
" helm install
$tls
--name notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
echo
" else"
echo
" else"
echo
" helm upgrade
$tls
notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
echo
" helm upgrade
$tls
notebook-info-db -f notebook-mongo-helm-values.yaml stable/mongodb"
...
@@ -311,7 +311,7 @@ echo " kubectl create -f user-settings-redis-volume.yaml"
...
@@ -311,7 +311,7 @@ echo " kubectl create -f user-settings-redis-volume.yaml"
echo
"# password secret"
echo
"# password secret"
echo
" kubectl create secret generic user-settings-db --from-file=redis-password=user-settings-redis-pwd.txt"
echo
" kubectl create secret generic user-settings-db --from-file=redis-password=user-settings-redis-pwd.txt"
echo
"# actual redis setup"
echo
"# actual redis setup"
echo
" if ! [[ -n
\"\$
(helm ls user-settings-db | grep -E '^user-settings-db
\s
' )
\"
]]; then"
echo
" if ! [[ -n
\"\$
(helm ls
$tls
user-settings-db | grep -E '^user-settings-db
\s
' )
\"
]]; then"
echo
" helm install
$tls
--name user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
echo
" helm install
$tls
--name user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
echo
" else"
echo
" else"
echo
" helm upgrade
$tls
user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
echo
" helm upgrade
$tls
user-settings-db -f user-settings-redis-helm-values.yaml stable/redis"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment