Commit Graph

886 Commits

Author SHA1 Message Date
GeorgianaElena
3527517165 Add docs 2020-06-21 13:52:39 +03:00
GeorgianaElena
b368b9716d Refactor proxy tests 2020-06-20 02:05:53 +03:00
GeorgianaElena
c9b920d677 Ensure dynamic config dir exists 2020-06-18 17:44:12 +03:00
GeorgianaElena
c31b9d3dea Allow extending traefik dynamic config 2020-06-18 17:29:50 +03:00
Yuvi Panda
6cbc997ed8 Merge pull request #582 from GeorgianaElena/allow-extending-traefik-config 2020-06-09 16:25:03 +05:30
Yuvi Panda
9736526edb Update docs/topic/escape-hatch.rst 2020-06-09 14:27:54 +05:30
Yuvi Panda
8162a3d6ea Update docs/topic/escape-hatch.rst 2020-06-09 14:27:46 +05:30
GeorgianaElena
392fb21059 Fix docs 2020-06-08 21:23:12 +03:00
GeorgianaElena
af6b56cf73 Update unit test 2020-06-08 12:36:26 +03:00
GeorgianaElena
fda0282151 Import merge dicts method 2020-06-08 12:15:42 +03:00
GeorgianaElena
a36de0715b Import CONFIG_DIR 2020-06-08 11:56:10 +03:00
GeorgianaElena
f1056339cc Add proxy integration test 2020-06-08 11:42:10 +03:00
GeorgianaElena
82f6173828 Use merge func instead for multi level dicts 2020-06-08 11:41:22 +03:00
GeorgianaElena
651425972f Modify loglevel 2020-06-05 15:04:14 +03:00
GeorgianaElena
6409e29fa8 Document traefik config escape hatch 2020-06-05 15:03:02 +03:00
GeorgianaElena
acc1eea251 Traefik config files are .toml 2020-06-02 19:09:19 +03:00
GeorgianaElena
8c14372356 Remove debug print 2020-06-02 18:29:12 +03:00
GeorgianaElena
b290ba2782 Remove pytoml (and use toml instead) 2020-06-02 18:27:56 +03:00
GeorgianaElena
54bc95668b Test Traefik extra config 2020-06-02 18:21:08 +03:00
GeorgianaElena
bb4614051b Refactor 2020-06-02 18:21:08 +03:00
GeorgianaElena
a2ccaef528 Use dump 2020-05-29 18:30:58 +03:00
GeorgianaElena
ec650ce3c1 Allow extra traefik config 2020-05-29 17:59:20 +03:00
Georgiana Elena
d2b8e24ef4 Merge pull request #570 from yuvipanda/feat/sha256
Use sha256 sums for verifying miniconda download
2020-05-29 14:34:08 +03:00
YuviPanda
f82c49c12c Use sha256 sums for verifying miniconda download
miniconda downloader now provides sha256 hashes. Previously
it provided only md5 hashes. md5 is deprecated everywhere for
everything, so let's use this
2020-05-29 13:32:55 +03:00
Georgiana Elena
ef802157ee Merge pull request #580 from GeorgianaElena/bum-mem
Provide more memory for integration tests
2020-05-29 13:25:20 +03:00
GeorgianaElena
3d431ada1b Document new memory limit 2020-05-29 13:03:22 +03:00
GeorgianaElena
18948998e6 Provide 1.15G for integration tests 2020-05-29 12:25:56 +03:00
Georgiana Elena
efb1f64fec Merge pull request #560 from jtpio/unused-plugins-argument
Remove unused plugins argument from run_plugin_actions
2020-05-14 14:22:05 +03:00
Yuvi Panda
90a73c9806 Merge pull request #568 from ideonate/master 2020-05-08 13:26:49 +05:30
Dan Lester
68f378b474 Add a useful link to the git repo, fix a typo, in docs 2020-05-06 20:08:01 +01:00
Yuvi Panda
68a84f1f92 Merge pull request #567 from jtpio/repo2docker-plugin 2020-05-05 20:32:13 +05:30
Jeremy Tuloup
7c58159fed Add tljh-repo2docker to the list of plugins 2020-05-05 13:44:37 +02:00
Erik Sundell
a97adcc7f4 Merge pull request #559 from yuvipanda/feat/upstream-culler
Use idle culler from jupyterhub-idle-culler package
2020-05-05 00:16:49 +02:00
Georgiana Elena
8d2a1c80d7 Merge pull request #566 from jtpio/integration-pip-spec
Rename to --bootstrap-pip-spec in the integration tests
2020-05-04 15:14:05 +03:00
Jeremy Tuloup
65d25aae74 Rename to --bootstrap-pip-spec in integration tests 2020-05-04 10:16:41 +02:00
YuviPanda
ed9430e6b9 [test] Provide 1.0G rather than 1G for integration tests
I couldn't figure out why JupyterLab fails to build
with 1G on initial commit, but succeeds if you do a bunch
of other commits after. Previously, I binary searched
down from 2G. Here, I just add a new, no-op commit
to see if that helps
2020-05-04 12:42:32 +05:30
YuviPanda
1c7e89ab1e Install jupyterhub-idle-culler from PyPI
A v1.0 release has been made!
2020-05-03 16:00:07 +05:30
YuviPanda
41474e97e3 Update tests to check for newer location of idle culler 2020-05-03 16:00:07 +05:30
YuviPanda
474005cbd1 Use idle culler from jupyterhub-idle-culler package
The idle culler lives as a script in at least 3 different
places:

- In the JupyterHub repo, as an 'example'
  d126baa443/examples/cull-idle
- In the TLJH repo, as a core part of the service
  01ba34857d/tljh/cull_idle_servers.py.
  This is an import from a specific version of the JupyterHub repo,
  and has had a couple of changes made to it since.
- In the z2jh repo, as a core part of the service
  c3f3be25f8/jupyterhub/files/hub/cull_idle_servers.py
  This is also an import from a specific version of the JupyterHub
  repo, but has had a lot more work done on it. Most had been sync'd
  back the JupyterHub repo, but some had not been. See
  9c15a42b12/images/hub/cull_idle_servers.py
  and https://github.com/jupyterhub/zero-to-jupyterhub-k8s/commits/master/jupyterhub/files/hub/cull_idle_servers.py

The idle culler is a core integral part of every JupyterHub deployment
these days. It would be great if it was maintained separately on
its own, without being split across multiple repos.

The latest changes had been to the version in the JupyterHub repo, so I
copied it (while preserving commit history, because credit is important)
to a new repository: https://github.com/yuvipanda/jupyterhub-idle-culler

I looked through z2jh and tljh copies, and cherry-picked the following
changes manually

ae80fb5163
836f19a4c7
a0787c64f1
b230ef8156
20374db7c6 (diff-f00cd100e9f673285208aaa6fc0c3212)

There were a few from 9c15a42b12/images/hub/cull_idle_servers.py
I could not apply, but mostly because those features had been
re-implemented already.

Right now, the package is a direct port of the code we had. Once
this settles in, I am hopefull we can iterate faster and make cool
new changes.
2020-05-03 16:00:07 +05:30
Georgiana Elena
8841bf056c Merge pull request #558 from jtpio/integration-tests-docs
Add bootstrap pip spec to the integration test docs
2020-04-30 17:32:13 +03:00
Jeremy Tuloup
5f693c2cbf Mention bootstrap_pip_spec in the tests docs 2020-04-30 16:01:16 +02:00
Georgiana Elena
914a1e8c7b Merge pull request #563 from GeorgianaElena/make_pip_spec_optional
Make bootstrap_pip_spec test argument optional
2020-04-30 16:34:08 +03:00
GeorgianaElena
c042c283d1 Remove space 2020-04-30 14:20:18 +03:00
GeorgianaElena
8e1d360eb4 Make bootstrap_pip_spec arg optional 2020-04-30 13:31:26 +03:00
Georgiana Elena
3454ff9c2d Merge pull request #561 from jtpio/plugins-docs
Add documentation to install multiple plugins
2020-04-30 13:17:06 +03:00
Jeremy Tuloup
cdbcdb1079 Add docs to install multiple plugins 2020-04-29 17:19:52 +02:00
Jeremy Tuloup
405a911f46 Remove unused plugins from run_plugin_actions 2020-04-29 11:43:53 +02:00
Yuvi Panda
01ba34857d Merge pull request #553 from GeorgianaElena/fix_grpcio_test_failure
Fix failing unit test
2020-04-23 18:01:33 +05:30
GeorgianaElena
b698188e1d Remove grpcio pin 2020-04-23 13:15:34 +03:00
GeorgianaElena
d00245e3bf Upgrade pip 2020-04-23 13:14:32 +03:00