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

Jh 4 0 #82

Merged
merged 14 commits into from
Oct 24, 2023
Merged

Jh 4 0 #82

merged 14 commits into from
Oct 24, 2023

Conversation

diocas
Copy link
Contributor

@diocas diocas commented Jun 16, 2023

Missing updates of Kubespawner, that @etejedor will work on.

Ofc this still has things that need to be removed and cleaned, but we need 1st to decomission puppet (to remove the extra user api handler) and to a new image, cleaned of extra, unwanted configs.
Also, once we update the design and user a more upstream look and feel, the overload of the spawner handler is no longer needed.

@etejedor
Copy link
Contributor

This is to be merged, when agreed, together with the corresponding PR of the swan charts: swan-cern/swan-charts#167.

We might need to reconsider if this needs to go together with an update of the systemuser image. Therefore, this is on hold for now.

diocas and others added 12 commits October 17, 2023 14:54
Removes User API handler and replaces it with scope configuration
Adapt Spawn Handler
Removes extra_env, replaced by upstream config option
No longer need to pass headers to requests (and no longer available)
Update readme to replace deprecated config
This overrides the stop method of kubespawner to include some
cleanup of secrets and services related to EOS and Spark after
the pod has terminated.

This was previously done in two post_stop_hook functions defined
in swan_config_cern.py and swan_spark_config.py in the swan-cern
chart. After moving to an async spawner, that hook can't be used
anymore because it can't be a coroutine (it is never awaited).
However, the moved code needs to be in a coroutine because it
includes calls to the k8s API that need to be awaited. This
justifies its transfer to stop, which is a coroutine.
We removed them from systemuser startup
The deletion of the corresponding secret is already done during
the stop method of our k8s spawner (this is included in the JH4
upgrade changes). Since the culler asks the hub to cull sessions,
the stop method will be called for each of those sessions, and
thus the EOS ticket secret will be removed.
.python-version Show resolved Hide resolved
.gitignore Show resolved Hide resolved
Copy link
Contributor Author

@diocas diocas left a comment

Choose a reason for hiding this comment

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

Approved (cannot approve my own PR)

@etejedor etejedor merged commit 108ea74 into master Oct 24, 2023
1 check passed
@etejedor etejedor deleted the jh_4_0 branch October 24, 2023 12:43
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