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

BGP basic configurations #193

Merged
merged 1 commit into from
May 6, 2024

Conversation

eduolivares
Copy link
Contributor

This patch includes kustomizations required to deploy BGP at different levels:

  • metallb
  • nad
  • control-plane
  • edpm

dt/bgp/kustomization.yaml Outdated Show resolved Hide resolved
@eduolivares
Copy link
Contributor Author

@eduolivares eduolivares force-pushed the bgp-basic-config branch 2 times, most recently from 5419af4 to 8cc383c Compare April 24, 2024 16:11
@eduolivares
Copy link
Contributor Author

@eduolivares eduolivares force-pushed the bgp-basic-config branch 2 times, most recently from af73b0e to 790baf5 Compare April 29, 2024 08:50
@abays
Copy link
Contributor

abays commented Apr 29, 2024

Could we get various .md READMEs included in this PR using the same pattern followed for other DTs and VAs? i.e. [1] [2] [3]
[1] https://github.com/openstack-k8s-operators/architecture/blob/main/examples/dt/uni01alpha/README.md [2] https://github.com/openstack-k8s-operators/architecture/blob/main/examples/dt/uni01alpha/control-plane.md [3] https://github.com/openstack-k8s-operators/architecture/blob/main/examples/dt/uni01alpha/data-plane.md

md files added. @abays, please let me know how they look to you.

The MD files look good

@leifmadsen leifmadsen added deployment-topology Deployment topology changes or implementations needs-testing Testing proof is required prior to merge triaged Issue has been initially reviewed and triaged labels Apr 29, 2024
@fultonj
Copy link
Contributor

fultonj commented Apr 29, 2024

@eduolivares This looks it's had some work behind it. Have you tested it or done any of the things from this doc?

#207

@eduolivares
Copy link
Contributor Author

@eduolivares This looks it's had some work behind it. Have you tested it or done any of the things from this doc?

#207

Yes. I tested this PR last week, using downstream jobs and it worked fine. Controlplane and Dataplane are successfully deployed.
I have some problems to run tests from the test-operator, but I think it's reasonable to merge this PR and resolve those issue later.
The reason is that I am not sure yet whether those problems will be fixed with changes in architecture (maybe metallb, but most probably not), test-operator, ci-fmw or some playbook in the downstream job.

@leifmadsen
Copy link
Contributor

@eduolivares This looks it's had some work behind it. Have you tested it or done any of the things from this doc?
#207

Yes. I tested this PR last week, using downstream jobs and it worked fine. Controlplane and Dataplane are successfully deployed. I have some problems to run tests from the test-operator, but I think it's reasonable to merge this PR and resolve those issue later. The reason is that I am not sure yet whether those problems will be fixed with changes in architecture (maybe metallb, but most probably not), test-operator, ci-fmw or some playbook in the downstream job.

Awesome thanks! I'm satisfied with this PR since it contains automation changes, has been noted as being manually tested, and has self-contained changes that wouldn't affect base components (and thus VAs).

@leifmadsen leifmadsen requested a review from fultonj April 30, 2024 13:23
@leifmadsen leifmadsen added ready-merge Request looks ready to be merged into repository and removed needs-testing Testing proof is required prior to merge labels Apr 30, 2024
@fultonj
Copy link
Contributor

fultonj commented Apr 30, 2024

Would you please rebase this PR on the main branch?

Mainly you're missing this: #197

When I test your PR using the current VA1 commands [1] it fails to build.

[1] https://github.com/openstack-k8s-operators/architecture/blob/main/examples/va/hci/dataplane-pre-ceph.md#initialize-pre-ceph

$ kustomize build edpm-pre-ceph/nodeset
$ kustomize build edpm-pre-ceph/deployment
$ kustomize build deployment

@fultonj fultonj removed the ready-merge Request looks ready to be merged into repository label Apr 30, 2024
@leifmadsen
Copy link
Contributor

Would you please rebase this PR on the main branch?

Mainly you're missing this: #197

Huh I'm surprised we don't get a button for that here. Maybe we need to enable the feature in GitHub that requests PRs be up to date against main. When we enable that, there will be a button to allow us to automatically rebase these in the UI.

(I don't have admin permissions for this repo, so I can't enable it, or I would :))

```
Generate the dataplane CRs.
```
kustomize build > dataplane.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

After rebasing on the main branch, this command will need to be updated since it will fail as below. Please split the dataplane nodeset and deployment into separate CR files.

[fultonj@runcible edpm{bgp-basic-config}]$ kustomize build > dataplane.yaml
Error: accumulating components: accumulateDirectory: "recursed accumulation of path '/home/fultonj/review/architecture/dt/bgp/edpm': accumulating components: accumulateDirectory: \"recursed accumulation of path '/home/fultonj/review/architecture/lib/dataplane': accumulating components: accumulateDirectory: \\\"recursed accumulation of path '/home/fultonj/review/architecture/lib/dataplane/nodeset': nothing selected by ConfigMap.[noVer].[noGrp]/edpm-nodeset-values.[noNs]:data.nodeset.ansible\\\"\""
[fultonj@runcible edpm{bgp-basic-config}]$

Copy link
Contributor

Choose a reason for hiding this comment

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

I have provided a PR against the base repo/branch to implement the refactoring. Please give it a check if you have a chance: eduolivares#1

@fultonj
Copy link
Contributor

fultonj commented Apr 30, 2024

Would you please rebase this PR on the main branch?
Mainly you're missing this: #197

Huh I'm surprised we don't get a button for that here. Maybe we need to enable the feature in GitHub that requests PRs be up to date against main. When we enable that, there will be a button to allow us to automatically rebase these in the UI.

(I don't have admin permissions for this repo, so I can't enable it, or I would :))

I do not have the Settings button to enable it either as described here.

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests

Rebasing via the CLI will work though (I always do it that way myself in order to resolve conflicts).

@leifmadsen
Copy link
Contributor

Huh I'm surprised we don't get a button for that here. Maybe we need to enable the feature in GitHub that requests PRs be up to date against main. When we enable that, there will be a button to allow us to automatically rebase these in the UI.
(I don't have admin permissions for this repo, so I can't enable it, or I would :))

I do not have the Settings button to enable it either as described here.

https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests

Rebasing via the CLI will work though (I always do it that way myself in order to resolve conflicts).

Yea that works fine. It was nice with STF repos so we could just see when the PR was out of sync with a visual indicator :)

@abays
Copy link
Contributor

abays commented May 1, 2024

Huh I'm surprised we don't get a button for that here. Maybe we need to enable the feature in GitHub that requests PRs be up to date against main. When we enable that, there will be a button to allow us to automatically rebase these in the UI.
(I don't have admin permissions for this repo, so I can't enable it, or I would :))

I do not have the Settings button to enable it either as described here.
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/configuring-commit-rebasing-for-pull-requests
Rebasing via the CLI will work though (I always do it that way myself in order to resolve conflicts).

Yea that works fine. It was nice with STF repos so we could just see when the PR was out of sync with a visual indicator :)

We actually already have Allow rebase merging checked. Do we want the option under it enabled?

image

@leifmadsen
Copy link
Contributor

@abays yea that's the option I was referring to :)

@abays
Copy link
Contributor

abays commented May 1, 2024

@abays yea that's the option I was referring to :)

Cool. I enabled it now.

@leifmadsen
Copy link
Contributor

FWIW I'm working on #193 (comment) as I hit the rebase button and broke this PR, so I'll submit another PR targeting this one with the expected changes.

@leifmadsen
Copy link
Contributor

I opened eduolivares#1 against the base repo/branch to fix the test-kustomize failure I caused when I did the PR rebase against main.

@eduolivares
Copy link
Contributor Author

Running a d/s job to test @leifmadsen's dataplane split.

@eduolivares eduolivares force-pushed the bgp-basic-config branch 4 times, most recently from 9f0324e to 5b3dbeb Compare May 6, 2024 08:58
@eduolivares
Copy link
Contributor Author

OK, several issues have been fixed since last week:

  • dataplane split
  • nncp default routes removed
  • octavia configuration was incomplete (we didn't see it before because the octavia operator missed some validations)

Current version works. It has just been tested d/s and the deployment works. The tempest tests fail until we find a solution for [1], which is my next task.

This PR is ready for reviews again and hopefully ready for merge.

[1] https://issues.redhat.com/browse/OSPRH-4826

values:
- name: network-values
src_file: nncp/values.yaml
build_output: ../control-plane.yaml
Copy link
Contributor

Choose a reason for hiding this comment

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

This should maybe just be like this [1]?

[1]

build_output: control-plane.yaml

Copy link
Contributor

Choose a reason for hiding this comment

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

Comment on lines 23 to 24
resources:
- nova_custom.yaml
Copy link
Contributor

@abays abays May 6, 2024

Choose a reason for hiding this comment

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

Copy link
Contributor

Choose a reason for hiding this comment

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

This patch includes kustomizations required to deploy BGP at different
levels:
- metallb
- nad
- control-plane
- edpm
Copy link
Contributor

@abays abays left a comment

Choose a reason for hiding this comment

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

/lgtm

@fultonj fultonj merged commit a0c052b into openstack-k8s-operators:main May 6, 2024
4 checks passed
@eduolivares eduolivares deleted the bgp-basic-config branch May 6, 2024 15:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
deployment-topology Deployment topology changes or implementations triaged Issue has been initially reviewed and triaged
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants