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

Add all c.BinderHub.* properties used in chart to Values.yaml #1603

Merged
merged 1 commit into from
Dec 29, 2022

Conversation

manics
Copy link
Member

@manics manics commented Dec 29, 2022

Follow-up to #1597

Adds all c.BinderHub.* properties used in chart to Values.yaml for visibility, except for buildDockerConfig which will be dealt with separately.

$ git grep Values\\.config\\. -- helm-chart/

helm-chart/binderhub/templates/_helpers.tpl:{{- if .Values.config.BinderHub.buildDockerConfig }}
helm-chart/binderhub/templates/_helpers.tpl:{{- $dockerConfig := merge $dockerConfig .Values.config.BinderHub.buildDockerConfig }}
helm-chart/binderhub/templates/container-builder/daemonset.yaml:      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | default dict | toJson }}
helm-chart/binderhub/templates/deployment.yaml:      {{- if .Values.config.BinderHub.use_registry }}
helm-chart/binderhub/templates/deployment.yaml:          {{- if .Values.config.BinderHub.use_registry }}
helm-chart/binderhub/templates/deployment.yaml:        {{- if .Values.config.BinderHub.auth_enabled }}
helm-chart/binderhub/templates/deployment.yaml:          value: {{ (print (.Values.config.BinderHub.hub_url_local | default .Values.config.BinderHub.hub_url | trimSuffix "/") "/hub/api/") }}
helm-chart/binderhub/templates/deployment.yaml:            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
helm-chart/binderhub/templates/deployment.yaml:            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
helm-chart/binderhub/templates/image-cleaner.yaml:      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }}
helm-chart/binderhub/templates/secret.yaml:{{- if or .Values.config.BinderHub.use_registry .Values.config.BinderHub.buildDockerConfig }}

This helps reduce the "hidden" configuration in the Helm Chart.

except for `buildDockerConfig` which is being dealt with seperately.

```
$ git grep Values\\.config\\. -- helm-chart/

helm-chart/binderhub/templates/_helpers.tpl:{{- if .Values.config.BinderHub.buildDockerConfig }}
helm-chart/binderhub/templates/_helpers.tpl:{{- $dockerConfig := merge $dockerConfig .Values.config.BinderHub.buildDockerConfig }}
helm-chart/binderhub/templates/container-builder/daemonset.yaml:      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | default dict | toJson }}
helm-chart/binderhub/templates/deployment.yaml:      {{- if .Values.config.BinderHub.use_registry }}
helm-chart/binderhub/templates/deployment.yaml:          {{- if .Values.config.BinderHub.use_registry }}
helm-chart/binderhub/templates/deployment.yaml:        {{- if .Values.config.BinderHub.auth_enabled }}
helm-chart/binderhub/templates/deployment.yaml:          value: {{ (print (.Values.config.BinderHub.hub_url_local | default .Values.config.BinderHub.hub_url | trimSuffix "/") "/hub/api/") }}
helm-chart/binderhub/templates/deployment.yaml:            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
helm-chart/binderhub/templates/deployment.yaml:            path: {{ .Values.config.BinderHub.base_url | default "/" }}versions
helm-chart/binderhub/templates/image-cleaner.yaml:      nodeSelector: {{ .Values.config.BinderHub.build_node_selector | toJson }}
helm-chart/binderhub/templates/secret.yaml:{{- if or .Values.config.BinderHub.use_registry .Values.config.BinderHub.buildDockerConfig }}
```

This helps reduce the "hidden" configuration in the Helm Chart.
@manics manics added the maintenance Under the hood improvements and fixes label Dec 29, 2022
@consideRatio consideRatio merged commit 3afb84c into jupyterhub:main Dec 29, 2022
consideRatio pushed a commit to jupyterhub/helm-chart that referenced this pull request Dec 29, 2022
jupyterhub/binderhub#1603 Merge pull request #1603 from manics/helmchart-config-defaults
@manics manics deleted the helmchart-config-defaults branch December 29, 2022 22:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Under the hood improvements and fixes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants