Skip to content

Commit

Permalink
Merge pull request 2i2c-org#997 from sgibson91/hardcode-docs-service
Browse files Browse the repository at this point in the history
  • Loading branch information
sgibson91 authored Feb 11, 2022
2 parents 4baa7a7 + 59fa47c commit fdfbce5
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 12 deletions.
12 changes: 0 additions & 12 deletions deployer/hub.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,18 +498,6 @@ def apply_hub_helm_chart_fixes(self, generated_config, secret_key):
"services", {}
)["hub-health"] = {"apiToken": hub_health_token, "admin": True}

docs_token = hmac.new(
secret_key, f'docs-{self.spec["name"]}'.encode(), hashlib.sha256
).hexdigest()
if (
"docs_service" in self.spec["config"].keys()
and self.spec["config"]["docs_service"]["enabled"]
):
generated_config["jupyterhub"]["hub"]["services"]["docs"] = {
"url": f'http://docs-service.{self.spec["name"]}',
"apiToken": docs_token,
}

# FIXME: Have a templates config somewhere? Maybe in Chart.yaml
# FIXME: This is a hack. Fix it.
if hub_helm_chart != "basehub":
Expand Down
2 changes: 2 additions & 0 deletions helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,8 @@ jupyterhub:
description: An IDE For R, created by the RStudio company

services:
docs:
url: http://docs-service
configurator:
url: http://configurator:10101
command:
Expand Down

0 comments on commit fdfbce5

Please sign in to comment.