Skip to content

fix default value of hub_url in config #1139

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

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+4 −3
Open

fix default value of hub_url in config #1139

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8db9c41
fix default value of hub_url in config
bitnik Aug 10, 2020
b45fc6a
Update helm-chart/images/binderhub/binderhub_config.py
bitnik Aug 30, 2020
6bc33d6
fixes after suggestion
bitnik Aug 30, 2020
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
2 changes: 1 addition & 1 deletion helm-chart/binderhub/templates/deployment.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ spec:
key: "binder.hub-token"
{{- if .Values.config.BinderHub.auth_enabled }}
- name: JUPYTERHUB_API_URL
value: {{ (print (.Values.config.BinderHub.hub_url | trimSuffix "/") "/hub/api/") }}
value: {{ print (.Values.config.BinderHub.hub_url | default "" | trimSuffix "/") "/hub/api/" }}
- name: JUPYTERHUB_BASE_URL
value: {{ .Values.jupyterhub.hub.baseUrl | quote }}
- name: JUPYTERHUB_CLIENT_ID
Expand Down
3 changes: 2 additions & 1 deletion helm-chart/images/binderhub/binderhub_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ def get_value(key, default=None):
c.BinderHub.build_namespace = os.environ['BUILD_NAMESPACE']

if c.BinderHub.auth_enabled:
hub_url = urlparse(c.BinderHub.hub_url)
hub_url = get_value('config.BinderHub.hub_url', '')
hub_url = urlparse(hub_url)
c.HubOAuth.hub_host = '{}://{}'.format(hub_url.scheme, hub_url.netloc)
if 'base_url' in c.BinderHub:
c.HubOAuth.base_url = c.BinderHub.base_url
Expand Down