Skip to content

Add SCS2 Cluster Stacks #232

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.

Sign up for GitHub

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

Jump to bottom
Merged
garloff merged 1 commit into from
Sep 25, 2025
Merged

Add SCS2 Cluster Stacks #232

garloff merged 1 commit into from
Sep 25, 2025

Conversation

@jschoone
Copy link
Contributor

@jschoone jschoone commented Jul 22, 2025 •
edited
Loading

Hi @garloff and @matofeder,

as discussed this is a PR containing the new Cluster Stack scs2.
The addons are already adjusted to use the clouds.yaml instead of generated cloud.conf (makes openstack-csp-helper unnecessary) (#225), also some variables are already renamed using lower camel case.

  • Rename variables to lower camel case
  • Replace Helm values with ClusterClass defaults
  • Start from Kubernetes 1.31
  • Adjust generate script to work with scs2
  • Enable Gateway API in cilium
  • Document migration path
    • What happens when changing from scs to scs2 ClusterClass?
      • Rename variables (capi controller will complain anyway)
      • CSPO can be removed
      • change managed secret
      • ORC needs to be added (if not present already)
      • ...

@jschoone
Copy link
Contributor Author

jschoone commented Jul 24, 2025

Hi @garloff, just saw the Point with the wishlist in the PB minutes. Please use the task list in the description here to collect them

@garloff
Copy link
Member

garloff commented Jul 25, 2025

Thanks a lot, @jschoone !

@garloff
Copy link
Member

garloff commented Aug 5, 2025 •
edited by jschoone
Loading

More points in the wishlist (in order of decreasing priority):

  • Passing CNCF e2e conformance (except [sig-network] HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol [LinuxOnly] [Conformance] which needs a waiver to avoid outlawing cilium)
  • Passing the other SCS compliance checks as well (which would include a commitment to push one patch release per month per minor version of k8s)
  • Default to using octavia-ovn for both loadbalancers (and making both configurable, ideally per cluster) - Supporting ovn LB #189
  • Support diskful flavors (non-default) by allowing not to attach a volume for booting (Remove default for worker_root_disk in scs cluster stack #223). Note: Technically, attaching a volume to a diskful flavor does work, but it leaves the local volume unused and is wasteful, which is bad.
  • Support for additionalBlockDevice (Configure additionalBlockDevice via cluster variable #231) option -- more generally try to keep alignment with UhuruTec's requirements
  • Support for Ubuntu 24.04 node images (capi-images #269)
    - [ ] Possibly a FlatCar option (Add Flatcar as OS for the node images #183), low prio
  • Avoid the need to bundle the helm charts from the addons using helm's --update-dependencies.

In addition, go through old wishlist

This list is too long -- we should not insist on getting it completed to make an scs2 worthwhile.

When prioritizing, we should have the normal benefit/effort ratio.
But also think whether features can easily be added (in a backwards-compatible way) later, because that makes them easier to skip initially.

@garloff garloff requested review from garloff and matofeder August 22, 2025 07:25
@jschoone jschoone linked an issue Sep 14, 2025 that may be closed by this pull request
Supporting ovn LB #189
Closed
@garloff
Copy link
Member

garloff commented Sep 23, 2025

Pending final testing, we should merge this, no?

@jschoone
feat(cluster-stacks): Add new Cluster Stacks scs2
04fc39b 
Signed-off-by: Jan Schoone <[email protected]>

Feat/scs2 rationalize descriptions (#236)

* Fix clusterclass var descriptions capitalization and defaults.
   Also, rationalize long descriptions to use multi-line yaml strings.
* Add missing {} on empty dict.
* Better description of apiServerLoadBalancer.

Signed-off-by: Kurt Garloff <[email protected]>
@jschoone
Copy link
Contributor Author

jschoone commented Sep 25, 2025

Pending final testing, we should merge this, no?

Yes, I squashed the commits, published openstack-scs2-1-33-v1 and added it to the README

@garloff
Copy link
Member

garloff commented Sep 25, 2025 •
edited
Loading

Perfect -- and it passed sonobuoy run --plugin-env=e2e.E2E_PROVIDER=openstack --e2e-skip="\[Disruptive\]|NoExecuteTaintManager|\[sig-network\] HostPort validates that there is no conflict between pods with same hostPort but different hostIP and protocol".

garloff
garloff approved these changes Sep 25, 2025
View reviewed changes
Copy link
Member

@garloff garloff left a comment

Choose a reason for hiding this comment

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

Works, passes tests. Let's merge.

@garloff garloff merged commit f5f9a42 into main Sep 25, 2025
5 checks passed
@garloff garloff deleted the scs2_cluster_stacks branch September 25, 2025 22:27
This was referenced Sep 25, 2025
Closed
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@garloff garloff garloff approved these changes

@matofeder matofeder Awaiting requested review from matofeder

Assignees

@jschoone jschoone

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Supporting ovn LB

3 participants

@jschoone @garloff