Add support for multicontrollers #500

averdagu · 2023-08-30T15:12:06Z

Adopting from an OSP 17.1 wallaby deployment formed by 3 controllers + 2 computes requires a
lot of manually changing hardcoded values on a few different files to adapt to the network schema of
wallaby deployment. With this pull request I intend to make it parameterizable

averdagu · 2023-08-30T15:13:09Z

Need to test it on an actual environment, submitted PR for initial feedback

openshift-ci · 2023-08-30T15:15:13Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: averdagu
Once this PR has been reviewed and has the lgtm label, please assign gibizer for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

openshift-ci · 2023-08-30T15:15:18Z

Hi @averdagu. Thanks for your PR.

I'm waiting for a openstack-k8s-operators member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

softwarefactory-project-zuul · 2023-08-30T16:54:46Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/51e3a694b38549d3a79be806783047c0

✔️ install-yamls-content-provider SUCCESS in 1h 40m 56s
❌ install-yamls-crc-podified-edpm-baremetal FAILURE in 19m 04s
✔️ install-yamls-crc-podified-galera-deployment SUCCESS in 36m 26s
❌ install-yamls-crc-podified-edpm-deployment FAILURE in 1h 28m 41s

softwarefactory-project-zuul · 2023-08-31T16:42:21Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/571502dfda8e4f118332827435542d13

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 07m 39s
❌ install-yamls-crc-podified-edpm-baremetal RETRY_LIMIT in 19m 10s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 51m 41s

devsetup/Makefile

softwarefactory-project-zuul · 2023-09-08T16:16:32Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/8f698f9af9b54dcdbf4c1d6d04f050a1

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 36m 21s
❌ install-yamls-crc-podified-edpm-baremetal FAILURE in 1h 23m 08s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 00m 01s

Makefile

devsetup/scripts/crc_del_multi_interfaces.sh

booxter · 2023-09-11T16:11:32Z

/ok-to-test

booxter · 2023-09-11T16:12:41Z

I think this PR should include some documentation (in devsetup dir?) explaining how this should be used for multi node case.

devsetup/scripts/crc_add_multi_interfaces.sh

hjensas · 2023-10-05T11:46:42Z

scripts/gen-netatt.sh

+echo STORAGE_IP_START ${STORAGE_IP_START}
+echo STORAGE_IP_END ${STORAGE_IP_END}
+echo TENANT_IP_START ${TENANT_IP_START}
+echo TENANT_IP_END ${TENANT_IP_END}

 cat > ${DEPLOY_DIR}/ctlplane.yaml <<EOF_CAT
 apiVersion: k8s.cni.cncf.io/v1


I wonder if this should/could make devsetup/scripts/bmaas/network-attachement-definition.sh more generic and re-use?

I think there are different things.
In this case during the gen-netatt.sh the NetworkAttachmentDefinition resources are being created. This will determine the IPs that will have the pods that have an interface on any of those networks. So at the end this script will generate openshift resources.

The newtork-attachment-definition.sh is useful to modify the crc VM (but gen-netatt.sh will be used regardless if we use crc or dev-metal3 deployment)

In order to adopt an OSP Wallaby environment, CRC VM needs to be able to connect to all Wallaby networks. With this new target CRC will be able to do it.

Adopting a multicontroller OSP 17.1 wallaby deployment means modifying a lot of the hardcoded values in nncp stage. In order to make things easier the Interfaces, Networks and vlans are parameterized. As well as adding a new variables section called MCD (multi cluster deployment) with the correct values to adopt a multi controller wallaby environment.

Adopting a multicontroller OSP 17.1 wallaby deployment means modifying a lot of the hardcoded values in netattach stage. In order to make things easier the Interfaces, Networks and vlans are parameterized.

openshift-ci · 2023-10-06T16:08:44Z

@averdagu: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name	Commit	Details	Required	Rerun command
ci/prow/precommit-check	`107c317`	link	true	`/test precommit-check`

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

softwarefactory-project-zuul · 2023-10-06T17:37:01Z

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/5bd0cb7dcaa54087815b9bd622035034

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 31m 28s
❌ install-yamls-crc-podified-edpm-baremetal FAILURE in 1h 15m 51s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 00m 05s

openshift-ci bot requested review from cjeanner and dprince August 30, 2023 15:15

openshift-ci bot added the needs-ok-to-test label Aug 30, 2023

averdagu force-pushed the multi-controllers branch from 6618686 to 53a848b Compare August 31, 2023 15:33

booxter reviewed Sep 5, 2023

View reviewed changes

devsetup/Makefile Outdated Show resolved Hide resolved

devsetup/Makefile Outdated Show resolved Hide resolved

devsetup/Makefile Outdated Show resolved Hide resolved

devsetup/Makefile Outdated Show resolved Hide resolved

averdagu force-pushed the multi-controllers branch 2 times, most recently from c9b5011 to 237c548 Compare September 8, 2023 14:38

booxter requested changes Sep 11, 2023

View reviewed changes

Makefile Outdated Show resolved Hide resolved

Makefile Outdated Show resolved Hide resolved

devsetup/scripts/crc_del_multi_interfaces.sh Show resolved Hide resolved

openshift-ci bot assigned booxter Sep 11, 2023

openshift-ci bot added ok-to-test and removed needs-ok-to-test labels Sep 11, 2023

jistr self-requested a review September 13, 2023 10:53

hjensas reviewed Oct 5, 2023

View reviewed changes

averdagu force-pushed the multi-controllers branch from 237c548 to e950ed8 Compare October 5, 2023 14:55

averdagu added 4 commits October 6, 2023 18:03

Create target to add 3 NICs to crc VM

dee9836

In order to adopt an OSP Wallaby environment, CRC VM needs to be able to connect to all Wallaby networks. With this new target CRC will be able to do it.

Modify netattach to allow interface/network range/vlan customization

2a430df

Adopting a multicontroller OSP 17.1 wallaby deployment means modifying a lot of the hardcoded values in netattach stage. In order to make things easier the Interfaces, Networks and vlans are parameterized.

Modify metallb/metallb_config to allow more customization

107c317

Adopting a multicontroller OSP 17.1 wallaby deployment means modifying a lot of the hardcoded values in netattach stage. In order to make things easier the Interfaces, Networks and vlans are parameterized.

averdagu force-pushed the multi-controllers branch from e950ed8 to 107c317 Compare October 6, 2023 16:03

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for multicontrollers #500

Add support for multicontrollers #500

averdagu commented Aug 30, 2023

averdagu commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 31, 2023

softwarefactory-project-zuul bot commented Sep 8, 2023

booxter commented Sep 11, 2023

booxter commented Sep 11, 2023

hjensas Oct 5, 2023

averdagu Oct 5, 2023

openshift-ci bot commented Oct 6, 2023

softwarefactory-project-zuul bot commented Oct 6, 2023

Add support for multicontrollers #500

Are you sure you want to change the base?

Add support for multicontrollers #500

Conversation

averdagu commented Aug 30, 2023

averdagu commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

openshift-ci bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 30, 2023

softwarefactory-project-zuul bot commented Aug 31, 2023

softwarefactory-project-zuul bot commented Sep 8, 2023

booxter commented Sep 11, 2023

booxter commented Sep 11, 2023

hjensas Oct 5, 2023

Choose a reason for hiding this comment

averdagu Oct 5, 2023

Choose a reason for hiding this comment

openshift-ci bot commented Oct 6, 2023

softwarefactory-project-zuul bot commented Oct 6, 2023