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

tickets/DM-40289: enable nublado3 at T&S sites #2385

Merged
merged 11 commits into from
Aug 17, 2023
Merged

Conversation

athornton
Copy link
Member

No description provided.

@athornton athornton requested a review from rra August 4, 2023 23:22
Comment on lines 71 to 73
singleuser:
extraAnnotations:
k8s.v1.cni.cncf.io/networks: "kube-system/dds"
Copy link
Member

Choose a reason for hiding this comment

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

Is this supposed to be an additional annotation to add to the created pod? If so, does this work? I feel like it couldn't work, since the Nublado controller is creating the pod and it doesn't know anything about this setting.

Copy link
Member Author

Choose a reason for hiding this comment

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

Uh oh. Something like this is going to need to work, which may require adding a new config setting to the controller.

Yes, this is the magic annotation on the pod that causes it to couple to the correct multus-provided network. It is untested, because only T&S sites use this feature.

Copy link
Member Author

Choose a reason for hiding this comment

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

OK, it we pass "annotations" into create_pod() it will do the right thing. Not sure if we've already got annotations in the pod config, but if not it's easy to add.

Copy link
Member Author

@athornton athornton Aug 4, 2023

Choose a reason for hiding this comment

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

Yeah, we'll have to add it as a config setting and then pipe it down through create_user_pod.

Copy link
Member Author

Choose a reason for hiding this comment

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

Copy link
Member

Choose a reason for hiding this comment

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

I think this is ready to go once extraAnnotations is moved into the lab controller configuration.

Copy link
Member Author

Choose a reason for hiding this comment

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

I've done that now.

@athornton athornton force-pushed the tickets/DM-40289 branch 3 times, most recently from 5d4d019 to eaf6ce0 Compare August 14, 2023 20:53
@athornton athornton requested a review from rra August 17, 2023 22:48
@athornton athornton added this pull request to the merge queue Aug 17, 2023
Merged via the queue into main with commit 3d8fe4d Aug 17, 2023
5 checks passed
@athornton athornton deleted the tickets/DM-40289 branch August 17, 2023 23:12
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.

3 participants