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 wooctavia and alpha to scs #81

Merged
merged 21 commits into from May 14, 2024
Merged

Conversation

paulphys
Copy link
Member

No description provided.

mxmxchere and others added 4 commits April 24, 2024 16:43
…spec

Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
openstackclustertemplate and kubeadmcontrolplanetemplate.
This commit is the "baseline" that our patches in cluster-class are
expecting
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
@mxmxchere mxmxchere changed the title Merge wooctavia and alpha to main Merge wooctavia and alpha to scs Apr 30, 2024
paulphys and others added 6 commits May 2, 2024 16:33
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
@paulphys paulphys marked this pull request as ready for review May 14, 2024 12:39
@paulphys paulphys requested a review from mxmxchere May 14, 2024 12:40
paulphys and others added 2 commits May 14, 2024 14:49
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
@mxmxchere
Copy link
Contributor

Tested both kube_vip for apiserver_loadbalancer and yawol as workload_loadbalancer.

@mxmxchere mxmxchere merged commit 7926f4c into main May 14, 2024
1 check passed
@mxmxchere mxmxchere deleted the merge-wooctavia-and-alpha-to-main branch May 14, 2024 12:52
jschoone added a commit that referenced this pull request May 17, 2024
* Updates wooctavia cluster-stack to accept image selection via clusterspec

Signed-off-by: Malte Münch <muench@b1-systems.de>

* kube-vip variables

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* apiserver and workload loadbalancer variables

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* add dns_nameservers and node_cidr variables

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* Fix syntax at node_cidr

Signed-off-by: Malte Münch <muench@b1-systems.de>

* include certSAN patch #79

Signed-off-by: Malte Münch <muench@b1-systems.de>

* Removed wooctavia kube_vip specifics from

openstackclustertemplate and kubeadmcontrolplanetemplate.
This commit is the "baseline" that our patches in cluster-class are
expecting

* (Patch 1/4) apiserver_loadbalancer=none

Signed-off-by: Malte Münch <muench@b1-systems.de>

* (Patch 2/4) apiserver_loadbalancer=octavia-amphora

Signed-off-by: Malte Münch <muench@b1-systems.de>

* (Patch 3/4) apiserver_loadbalancer=octavia-ovn

Signed-off-by: Malte Münch <muench@b1-systems.de>

* (Patch 4/4) apiserver_loadbalancer=kube-vip

Signed-off-by: Malte Münch <muench@b1-systems.de>

* Minor syntax fixes

Signed-off-by: Malte Münch <muench@b1-systems.de>

* Minor fix/op replace to add

Signed-off-by: Malte Münch <muench@b1-systems.de>

* Make occm configurable with loadbalancers

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* deploy yawol when yawol flag is set

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* Current state cluster-addon-values

Signed-off-by: Malte Münch <muench@b1-systems.de>

* yawol templating

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* new scs stack

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

* tweaks

Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>

---------

Signed-off-by: Malte Münch <muench@b1-systems.de>
Signed-off-by: Paul Hildebrandt <hildebrandt@b1-systems.de>
Co-authored-by: Malte Münch <muench@b1-systems.de>
Co-authored-by: Jan Schoone <6106846+jschoone@users.noreply.github.com>
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.

Consolidate Clusterstacks wooctavia and alpha to scs | Discussion about LoadBalancer flags
3 participants