Skip to content

Is207/reverse proxy director - missing parts #388

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 167 commits into from
Nov 30, 2018
Merged

Is207/reverse proxy director - missing parts #388

Changes from all commits
Commits
Show all changes
167 commits
Select commit Hold shift + click to select a range
2741834
Fixes typos in client after bad merge
Jul 6, 2018
9646035
Merge remote-tracking branch 'upstream/master'
Jul 6, 2018
c3ad81c
Merge remote-tracking branch 'upstream/master'
Jul 6, 2018
d7b91f7
Merge remote-tracking branch 'upstream/master'
Jul 10, 2018
a65aa8e
Merge remote-tracking branch 'upstream/master'
Jul 11, 2018
4edc12a
Merge remote-tracking branch 'upstream/master'
Jul 16, 2018
460bdea
Merge remote-tracking branch 'upstream/master'
Jul 16, 2018
408990d
Merge remote-tracking branch 'upstream/master'
Jul 18, 2018
ee1b91b
Merge remote-tracking branch 'upstream/master'
Jul 20, 2018
cf7b3f4
Merge remote-tracking branch 'upstream/master'
Aug 9, 2018
3f4eed8
Merge remote-tracking branch 'upstream/master'
Aug 22, 2018
14cbec2
Merge remote-tracking branch 'upstream/master'
Aug 23, 2018
b57188b
Merge remote-tracking branch 'upstream/master'
Sep 3, 2018
66e5cdc
Merge remote-tracking branch 'upstream/master'
Sep 4, 2018
31aeb8f
Merge remote-tracking branch 'upstream/master'
Sep 13, 2018
c0dbe36
Merge remote-tracking branch 'upstream/master'
Sep 18, 2018
81111e0
Merge remote-tracking branch 'upstream/master'
Sep 19, 2018
6b4c1bf
Merge remote-tracking branch 'upstream/master'
Sep 24, 2018
bbe7558
Merge remote-tracking branch 'upstream/master'
Sep 25, 2018
fd2befe
Merge remote-tracking branch 'upstream/master'
Oct 10, 2018
6b0dd8f
Merge remote-tracking branch 'upstream/master'
Oct 12, 2018
b706243
Merge remote-tracking branch 'upstream/master'
Oct 17, 2018
0bf32b8
Merge remote-tracking branch 'upstream/master'
Oct 17, 2018
d0664c9
Merge remote-tracking branch 'upstream/master'
Oct 19, 2018
5e895e0
Merge remote-tracking branch 'upstream/master'
Oct 19, 2018
90eb8f4
Merge remote-tracking branch 'upstream/master'
Oct 19, 2018
dc90291
Merge remote-tracking branch 'upstream/master'
Oct 19, 2018
152d2cc
Merge remote-tracking branch 'upstream/master'
pcrespov Oct 22, 2018
4628a6e
Merge remote-tracking branch 'upstream/master'
pcrespov Oct 23, 2018
9c49147
Merge remote-tracking branch 'upstream/master'
Oct 24, 2018
21aeab8
Merge branch 'master' of github.com:pcrespov/osparc-simcore
Oct 24, 2018
62eb5c5
Merge remote-tracking branch 'upstream/master'
Oct 26, 2018
65f510c
Merge remote-tracking branch 'upstream/master'
Oct 29, 2018
9e40d37
Merge remote-tracking branch 'upstream/master'
Oct 30, 2018
77d6ac1
Merge remote-tracking branch 'upstream/master'
pcrespov Oct 31, 2018
e733846
Merge branch 'master' of github.com:pcrespov/osparc-simcore
Oct 31, 2018
6ca6aad
Merge remote-tracking branch 'upstream/master'
Oct 31, 2018
d423dcc
Merge remote-tracking branch 'upstream/master'
Nov 2, 2018
0fd2975
Merge remote-tracking branch 'upstream/master'
Nov 5, 2018
4a8c093
Merge remote-tracking branch 'upstream/master'
Nov 7, 2018
cf6c63a
Merge remote-tracking branch 'upstream/master'
Nov 9, 2018
5320cef
Merge remote-tracking branch 'upstream/master'
Nov 9, 2018
e71ed59
Merge remote-tracking branch 'upstream/master'
Nov 13, 2018
0156ec8
Merge remote-tracking branch 'upstream/master'
Nov 13, 2018
ed07bfd
Merge remote-tracking branch 'upstream/master'
Nov 14, 2018
f5a7f50
Merge remote-tracking branch 'upstream/master'. Includes all storage PR
Nov 15, 2018
760a171
Merge remote-tracking branch 'upstream/master'
Nov 15, 2018
ff98b74
Merge remote-tracking branch 'upstream/master'
Nov 16, 2018
8840923
Merge remote-tracking branch 'upstream/master'
Nov 21, 2018
9447215
Merge remote-tracking branch 'upstream/master'
Nov 21, 2018
4268be3
Merge remote-tracking branch 'upstream/master'
Nov 21, 2018
b3b8a48
webserver.director subsystem:
Nov 21, 2018
14fccd6
WIP: building coupling between revers_proxy and dicector subsystems
Nov 21, 2018
2e8fd15
Merge remote-tracking branch 'upstream/master'
Nov 22, 2018
88b7c5f
Merge remote-tracking branch 'upstream/master'
Nov 23, 2018
dad2661
Merge branch 'master' into is207/reverse-proxy-director
Nov 23, 2018
85da9b2
Modifies director API specs. Implementation expected in #363
Nov 23, 2018
65146fd
cleanup and naming services
Nov 23, 2018
72b4c78
WIP: implementing service resolution policy with director sdk
Nov 23, 2018
ee88741
Merge remote-tracking branch 'upstream/master'
Nov 23, 2018
73b416b
Merge remote-tracking branch 'pcrespo/is207/reverse-proxy-director' i…
sanderegg Nov 24, 2018
3feb049
running_services get now returns also the service and its key/version
sanderegg Nov 25, 2018
a858db1
modified tests according to requirements
sanderegg Nov 25, 2018
85c8a3b
modified handlers to work according to requirements
sanderegg Nov 25, 2018
3e0e12e
pylint
sanderegg Nov 25, 2018
7e39ce6
updated server information
sanderegg Nov 25, 2018
5692d55
automatically create the resolved oas file
sanderegg Nov 25, 2018
7d539bf
updated generator version
sanderegg Nov 25, 2018
a3c522c
updated director sdk
sanderegg Nov 25, 2018
7e2c3e2
updated director openapi
sanderegg Nov 25, 2018
16ac3c0
updated version check
sanderegg Nov 25, 2018
0e52049
fixed regex error in client code
sanderegg Nov 26, 2018
faea37d
updated sample
sanderegg Nov 26, 2018
b8c1cd2
revert change
sanderegg Nov 26, 2018
d589b74
Merge pull request #10 from sanderegg/reverse_proxy_director_update
pcrespov Nov 26, 2018
fb2d441
Merge branch 'is207/reverse-proxy-director' of github.com:pcrespov/os…
Nov 26, 2018
93f4dc4
formatted director.producer to ready easier
Nov 26, 2018
236f687
Implemented ServiceResolutionPolicy with director in application_proxy
Nov 26, 2018
6df2a4f
Merge remote-tracking branch 'upstream/master'
Nov 26, 2018
4fcc8ac
Merge branch 'master' into is207/reverse-proxy-director
Nov 26, 2018
1fb0d5f
Minor
Nov 26, 2018
b5ee3b7
Cleanup dev requirements
Nov 26, 2018
ca843b4
Cleanup director tests while reviewing them
Nov 26, 2018
9e60daa
Fixes duplicated storage in docker-compose
Nov 26, 2018
876d05d
Minor cleanup and adds apihub dependency to storage
Nov 26, 2018
889bc06
Merge remote-tracking branch 'upstream/master'
Nov 27, 2018
1ba1d67
Merge branch 'master' into is207/reverse-proxy-director
Nov 27, 2018
2c048d2
Modified director APi specs
Nov 27, 2018
ac55bc9
WIP: application proxy implementation using new director api
Nov 27, 2018
08c7e5a
default is empty basepath
sanderegg Nov 27, 2018
f4371d1
generated client for new api with basepath
sanderegg Nov 27, 2018
a345972
updated director api server side
sanderegg Nov 27, 2018
728243e
Minor cleanup
Nov 27, 2018
7ff54a9
update test for director
sanderegg Nov 27, 2018
112c282
Merge remote-tracking branch 'upstream/master'
Nov 27, 2018
34b7b40
Merge branch 'master' into is207/reverse-proxy-director
Nov 27, 2018
0910ae5
updated tests
sanderegg Nov 27, 2018
047863a
all tests passing
sanderegg Nov 27, 2018
c282d1e
update to the api
sanderegg Nov 27, 2018
3134889
fixed not getting service correctly
sanderegg Nov 27, 2018
5eda454
Merge pull request #12 from sanderegg/pcrespov-is207/reverse-proxy-di…
pcrespov Nov 27, 2018
0f0d6e3
Merge branch 'is207/reverse-proxy-director' of github.com:pcrespov/os…
Nov 27, 2018
c1e1358
WIP: implementing integration tests for reverse proxy
Nov 27, 2018
bdf614e
added apihub
sanderegg Nov 27, 2018
e5a5aea
start notebook with a base path
sanderegg Nov 27, 2018
41c4f2c
version bump
sanderegg Nov 27, 2018
83dcef9
added SIMCORE_NODE_BASEPATH
sanderegg Nov 27, 2018
c3edfe9
fixed copy of custom.js to set notebook in single-tab mode
sanderegg Nov 28, 2018
02c2339
fixed alternative basepath
sanderegg Nov 28, 2018
23b3e4e
Merge remote-tracking branch 'upstream/master' into reverse_proxy_mod…
sanderegg Nov 28, 2018
43302aa
adding missing veriable and baseurl env
sanderegg Nov 28, 2018
dc7ec85
refactoring
sanderegg Nov 28, 2018
f92e667
Merge branch 'master' into reverse_proxy_modeler
sanderegg Nov 28, 2018
28ac089
Merge branch 'master' into is207/reverse-proxy-director
pcrespov Nov 28, 2018
f35b6bb
added config file
sanderegg Nov 28, 2018
32b002b
Prepared integration-test for reverse proxy
Nov 28, 2018
1a6bfef
websocket also on alternative basepath
sanderegg Nov 28, 2018
ccfba96
Merge remote-tracking branch 'pcrespo/is207/reverse-proxy-director' i…
sanderegg Nov 28, 2018
b354ccb
duplicate key
sanderegg Nov 28, 2018
e156b45
pylint
sanderegg Nov 28, 2018
963f439
fix failing test
sanderegg Nov 28, 2018
9bfcdb4
version bump
sanderegg Nov 28, 2018
a98d5fa
empty basepath default
sanderegg Nov 28, 2018
050de02
handle error
sanderegg Nov 28, 2018
133a371
fix catch
sanderegg Nov 28, 2018
b5911bd
fix default env
sanderegg Nov 28, 2018
3ce95eb
final fix
sanderegg Nov 28, 2018
8694ca3
Merge pull request #13 from sanderegg/reverse_proxy_jupyter
pcrespov Nov 28, 2018
77eb518
Merge pull request #14 from sanderegg/reverse_proxy_modeler
pcrespov Nov 28, 2018
b1e8152
Cleanup:
Nov 28, 2018
35f754a
Fixed webserver.director handlers
Nov 28, 2018
d6d3441
Minor
Nov 28, 2018
34fa3aa
Merge branch 'is207/reverse-proxy-director' of github.com:pcrespov/os…
Nov 28, 2018
ccd8d6c
Using aiohttp client session instead of sdk
Nov 28, 2018
2777f23
Minor
Nov 28, 2018
9ce1023
Added makefile to build swarm and tooling
Nov 28, 2018
4739151
webserver.director found director api endpoint upon setup
Nov 28, 2018
9b29dd4
application-proxy:
Nov 28, 2018
e9db76d
Fixes responses from director
Nov 28, 2018
197bc73
Fixes on jupyter handlers
Nov 28, 2018
d84a693
application_proxy:
Nov 28, 2018
82728ee
tests pass using a sleep to wait the service to start
Nov 28, 2018
01cc496
Disableds proxy if director is disabled
Nov 28, 2018
b81efd1
Merge branch 'master' into is207/reverse-proxy-director
pcrespov Nov 28, 2018
2fcc0f0
Minor
Nov 28, 2018
a5b9f9d
Merge remote-tracking branch 'upstream/master'
Nov 28, 2018
f1b7aab
Merge branch 'master' into is207/reverse-proxy-director
Nov 28, 2018
7389557
Merge branch 'is207/reverse-proxy-director' of github.com:pcrespov/os…
Nov 28, 2018
ca8c514
fixes eslint
sanderegg Nov 28, 2018
8bd7ce7
Merge branch 'master' into is207/reverse-proxy-director
pcrespov Nov 28, 2018
6c8870e
Fixes test-failure in storage
pcrespov Nov 29, 2018
1533ac0
Minor
pcrespov Nov 29, 2018
42da6cd
Merge remote-tracking branch 'upstream/master'
Nov 29, 2018
64a4f9e
Adds stdin_open and tty options in docker-compose.devel to enable deb…
Nov 29, 2018
e49d57b
Fixes oas_repo config for docker-dev. repo root does not exists insid…
Nov 29, 2018
061c803
Merge branch 'master' into is207/reverse-proxy-director
pcrespov Nov 29, 2018
cfa4c09
Minor bug in weberver.director subsystem
Nov 29, 2018
88208cb
Front-end now requests interactive services via the reverse proxy
Nov 29, 2018
b60ad51
Merge remote-tracking branch 'upstream/master'
Nov 29, 2018
e521610
Merge branch 'master' into is207/reverse-proxy-director
Nov 29, 2018
fd3ca98
Fixes reverse_proxy jupyter handler
Nov 29, 2018
39a221a
Fixes webserver.projects handler to retrieve template projects
Nov 29, 2018
53c2fb8
Minor cleanup
Nov 29, 2018
559799b
Merge remote-tracking branch 'upstream/master'
Nov 30, 2018
4ace286
Merge branch 'master' into is207/reverse-proxy-director
Nov 30, 2018
1dd7607
Merge branch 'master' into is207/reverse-proxy-director
sanderegg Nov 30, 2018
fa38b5b
Merge branch 'master' into is207/reverse-proxy-director
pcrespov Nov 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

These merge commits were added into this branch cleanly.

There are no new changes to show.