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

Merge hub.extraEnv env vars #968

Merged
merged 4 commits into from
Dec 14, 2021
Merged

Merge hub.extraEnv env vars #968

merged 4 commits into from
Dec 14, 2021

Conversation

danlester
Copy link
Contributor

@danlester danlester commented Dec 12, 2021

Merge hub.extraEnv env vars and hub.extraConfig in jupyterhub helm chart.

Changes:

If the following is in the qhub-config.yaml file:

jupyterhub:
  overrides:
    hub:
      config:
        Authenticator:
          enable_auth_state: true
      extraEnv:
      - name: "MYENV1"
        value: "11111"
      - name: "MYENV2"
        value: "22222"

      extraConfig:
        new-config-thing: |
          c.KubeSpawner.something = 123

then, despite the overrides supposed to be added to the JupyterHub Helm release, previously anything under hub.extraEnv would be lost when further overridden by QHub's own required env vars.

This PR merges them instead so the user's env vars should make it into the Hub pod.

Similarly for extraConfig.

Types of changes

What types of changes does your code introduce?

Put an x in the boxes that apply

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds a feature)
  • Breaking change (fix or feature that would cause existing features to not work as expected)
  • Documentation Update
  • Code style update (formatting, renaming)
  • Refactoring (no functional changes, no API changes)
  • Build related changes
  • Other (please describe):

Testing

Requires testing

  • Yes
  • No

In case you checked yes, did you write tests?

  • Yes
  • No

@danlester danlester requested a review from viniciusdc December 12, 2021 14:01
Copy link
Contributor

@viniciusdc viniciusdc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM! The overrides also affects the jupyterhub.py as well?

@danlester danlester merged commit 0326eb4 into main Dec 14, 2021
@iameskild iameskild deleted the hubextraenv branch May 11, 2022 00:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants