Skip to content
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.

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

deployer: don't generate config in deployer anymore #2349

Merged
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
3 changes: 1 addition & 2 deletions config/clusters/2i2c/ohw.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,7 @@ basehub:
add_staff_user_ids_to_admin_users: true
add_staff_user_ids_of_type: "github"
homepage:
hubTemplateRepoDetails:
repo_branch: "2i2c-ohw"
gitRepoBranch: "2i2c-ohw"
templateVars:
org:
name: OceanHackWeek
Expand Down
3 changes: 1 addition & 2 deletions config/clusters/callysto/prod.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ jupyterhub:
oauth_callback_url: https://2i2c.callysto.ca/hub/oauth_callback
custom:
homepage:
hubTemplateRepoDetails:
repo_branch: "callysto-prod"
gitRepoBranch: "callysto-prod"
3 changes: 1 addition & 2 deletions config/clusters/callysto/staging.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ jupyterhub:
oauth_callback_url: https://staging.callysto.2i2c.cloud/hub/oauth_callback
custom:
homepage:
hubTemplateRepoDetails:
repo_branch: "callysto-staging"
gitRepoBranch: "callysto-staging"
3 changes: 1 addition & 2 deletions config/clusters/utoronto/default-prod.values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ jupyterhub:
memory: 57350076Ki
custom:
homepage:
hubTemplateRepoDetails:
repo_branch: "utoronto-prod"
gitRepoBranch: "utoronto-prod"
hub:
db:
pvc:
Expand Down
3 changes: 1 addition & 2 deletions config/clusters/utoronto/default-staging.values.yaml
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
jupyterhub:
custom:
homepage:
hubTemplateRepoDetails:
repo_branch: "utoronto-staging"
gitRepoBranch: "utoronto-staging"
hub:
config:
AzureAdOAuthenticator:
Expand Down
6 changes: 3 additions & 3 deletions helm-charts/basehub/templates/configmap-hub-templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
labels:
app: jupyterhub
data:
{{- with .Values.jupyterhub.custom.homepage.hubTemplateRepoDetails }}
HUB_TEMPLATES_REPO_URL: {{ .repo_url | quote }}
HUB_TEMPLATES_REPO_BRANCH: {{ .repo_branch | quote }}
{{- with .Values.jupyterhub.custom.homepage }}
HUB_TEMPLATES_REPO_URL: {{ .gitRepoUrl | quote }}
HUB_TEMPLATES_REPO_BRANCH: {{ .gitRepoBranch | quote }}
{{- end }}
30 changes: 13 additions & 17 deletions helm-charts/basehub/values.schema.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -283,25 +283,21 @@ properties:
required:
- templateVars
GeorgianaElena marked this conversation as resolved.
Show resolved Hide resolved
properties:
hubTemplateRepoDetails:
type: object
additionalProperties: false
properties:
repo_url:
type: string
description: |
The URL of the repository hosting custom hub templates
that should override the hub homepage default ones.
gitRepoUrl:
type: string
description: |
The URL of the repository hosting custom hub templates
that should override the hub homepage default ones.

Example: https://github.com/2i2c-org/default-hub-homepage
repo_branch:
type: string
description: |
The name of the branch of the repository at `hubTemplateRepoDetails.repo_url`
to pull the custom templates from.
Should be used to customize the homepage of a hub.
Example: https://github.com/2i2c-org/default-hub-homepage
gitRepoBranch:
type: string
description: |
The name of the branch of the repository at `hubTemplateRepoDetails.repo_url`
to pull the custom templates from.
Should be used to customize the homepage of a hub.

The convention for the name of this branch is `<cluster-name>-<hub-name>`.
The convention for the name of this branch is `<cluster-name>-<hub-name>`.
templateVars:
type: object
additionalProperties: false
Expand Down
7 changes: 3 additions & 4 deletions helm-charts/basehub/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,9 @@ jupyterhub:
- [email protected]
- [email protected]
homepage:
hubTemplateRepoDetails:
repo_url: "https://github.com/2i2c-org/default-hub-homepage"
# TODO: make main the default branch in the repo above
repo_branch: "master"
gitRepoUrl: "https://github.com/2i2c-org/default-hub-homepage"
# TODO: make main the default branch in the repo above
gitRepoBranch: "master"
ingress:
enabled: true
annotations:
Expand Down