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

Decouple uni01alpha network stage from control plane stage #497

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

hjensas
Copy link
Contributor

@hjensas hjensas commented Feb 7, 2025

This removes the networking components...

MetalLB
NetConfig
Net-attach-def

...from the control plane stage of dt/uni01alpha and gives them their own separate stage in between the NNCP stage and the control plane stage.

This is needed for the uni01alpha adoption job, which relies upon this DT. For adoption we want to create the NNCPs, MetalLB CRs, NetConfig CR and Net-attach-defs, but do NOT want to create the OpenStackControlPlane.

Following this can this can be done by creating an automation file with only two stages, one for NNCPs and the other for the other networking components.

This change was created using the following PR as inspiration: #489

Jira: OSPRH-13801

@hjensas hjensas requested a review from abays February 7, 2025 12:51
@openshift-ci openshift-ci bot requested review from cjeanner and fultonj February 7, 2025 12:51
Copy link

openshift-ci bot commented Feb 7, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: hjensas
Once this PR has been reviewed and has the lgtm label, please assign cjeanner for approval. For more information see the 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:

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

@hjensas hjensas requested review from ciecierski and removed request for fultonj and cjeanner February 7, 2025 12:51
Copy link
Contributor

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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/0830e0c56dda42e887f585b7c16b5090

✔️ noop SUCCESS in 0s
✔️ rhoso-architecture-validate-hci SUCCESS in 4m 45s
✔️ rhoso-architecture-validate-hci-adoption SUCCESS in 5m 36s
✔️ rhoso-architecture-validate-uni01alpha SUCCESS in 6m 27s
rhoso-architecture-validate-uni01alpha-adoption FAILURE in 5m 19s

@hjensas hjensas force-pushed the OSPRH-13801 branch 2 times, most recently from f1917c1 to 9c3b7e5 Compare February 7, 2025 13:03
@hjensas
Copy link
Contributor Author

hjensas commented Feb 7, 2025

I ran a testproject, the controlplane and EDPM networker nodes deployed fine, EDPM computes failed on an unrelated authentication error when attempting to pulling containers from registry.redhat.io.

A grep in the ansible-deploy-architecture.log shows it is using the new "networking" step introduced in this change.

2025-02-07 10:13:14,429 p=26969 u=zuul n=ansible | TASK [Executing pre_stage hooks for examples/dt/uni01alpha/control-plane/networking/nncp name=run_hook] ***
2025-02-07 10:13:15,692 p=26969 u=zuul n=ansible | TASK [Generate values.yaml for examples/dt/uni01alpha/control-plane/networking/nncp name=ci_gen_kustomize_values] ***
2025-02-07 10:13:20,694 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Copy generated values for examples/dt/uni01alpha/control-plane/networking/nncp mode=0644, backup=True, remote_src=True, src={{
2025-02-07 10:13:21,019 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Build kustomized content for examples/dt/uni01alpha/control-plane/networking/nncp chdir={{ _chdir }}, _raw_params=oc kustomize] ***
2025-02-07 10:13:21,924 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Store kustomized content in artifacts for examples/dt/uni01alpha/control-plane/networking/nncp remote_src=True, src={{ _output }}, dest={{
2025-02-07 10:13:22,213 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Apply generated content for examples/dt/uni01alpha/control-plane/networking/nncp _raw_params=oc apply -f {{ _cr }}] ***
2025-02-07 10:13:22,713 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Run Wait Conditions for examples/dt/uni01alpha/control-plane/networking/nncp _raw_params={{ wait_condition }}] ***
2025-02-07 10:13:27,388 p=26969 u=zuul n=ansible | TASK [Executing post_stage hooks for examples/dt/uni01alpha/control-plane/networking/nncp name=run_hook] ***
2025-02-07 10:13:28,311 p=26969 u=zuul n=ansible | TASK [Executing pre_stage hooks for examples/dt/uni01alpha/control-plane/networking name=run_hook] ***
2025-02-07 10:13:28,702 p=26969 u=zuul n=ansible | TASK [Generate values.yaml for examples/dt/uni01alpha/control-plane/networking name=ci_gen_kustomize_values] ***
2025-02-07 10:13:33,891 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Copy generated values for examples/dt/uni01alpha/control-plane/networking mode=0644, backup=True, remote_src=True, src={{
2025-02-07 10:13:34,217 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Build kustomized content for examples/dt/uni01alpha/control-plane/networking chdir={{ _chdir }}, _raw_params=oc kustomize] ***
2025-02-07 10:13:35,052 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Store kustomized content in artifacts for examples/dt/uni01alpha/control-plane/networking remote_src=True, src={{ _output }}, dest={{
2025-02-07 10:13:35,348 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Apply generated content for examples/dt/uni01alpha/control-plane/networking _raw_params=oc apply -f {{ _cr }}] ***
2025-02-07 10:13:35,954 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Run Wait Conditions for examples/dt/uni01alpha/control-plane/networking _raw_params={{ wait_condition }}] ***
2025-02-07 10:13:36,681 p=26969 u=zuul n=ansible | TASK [Executing post_stage hooks for examples/dt/uni01alpha/control-plane/networking name=run_hook] ***
2025-02-07 10:13:38,001 p=26969 u=zuul n=ansible | TASK [Executing pre_stage hooks for examples/dt/uni01alpha/control-plane name=run_hook] ***
2025-02-07 10:13:38,389 p=26969 u=zuul n=ansible | TASK [Generate values.yaml for examples/dt/uni01alpha/control-plane name=ci_gen_kustomize_values] ***
2025-02-07 10:13:47,477 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Copy generated values for examples/dt/uni01alpha/control-plane mode=0644, backup=True, remote_src=True, src={{
2025-02-07 10:13:48,082 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Build kustomized content for examples/dt/uni01alpha/control-plane chdir={{ _chdir }}, _raw_params=oc kustomize] ***
2025-02-07 10:13:48,898 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Store kustomized content in artifacts for examples/dt/uni01alpha/control-plane remote_src=True, src={{ _output }}, dest={{
2025-02-07 10:13:49,191 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Apply generated content for examples/dt/uni01alpha/control-plane _raw_params=oc apply -f {{ _cr }}] ***
2025-02-07 10:13:49,654 p=26969 u=zuul n=ansible | TASK [kustomize_deploy : Run Wait Conditions for examples/dt/uni01alpha/control-plane _raw_params={{ wait_condition }}] ***
2025-02-07 10:24:09,858 p=26969 u=zuul n=ansible | TASK [Executing post_stage hooks for examples/dt/uni01alpha/control-plane name=run_hook] ***

@jirimacku
Copy link
Contributor

Tested with regular unialpha job. Deployment passed.

Copy link
Contributor

Choose a reason for hiding this comment

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

seems not related to dt/uni01alpha

Copy link
Contributor Author

Choose a reason for hiding this comment

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

w00t, indeed this patch should not change those files.
Thanks for catching that @dsariel, I am not sure what went wrong there.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

va/hci files reverted to what is on main.

DONE

Copy link
Contributor

Choose a reason for hiding this comment

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

and this one

Copy link
Contributor Author

Choose a reason for hiding this comment

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

va/hci files reverted to what is on main.

DONE

@hjensas hjensas added the do-not-merge Changes are not ready to be merged label Feb 12, 2025
This removes the networking components...

    MetalLB
    NetConfig
    Net-attach-def

...from the control plane stage of dt/uni01alpha and gives them their
own separate stage in between the NNCP stage and the control plane
stage.

This is needed for the uni01alpha adoption job, which relies upon
this DT. For adoption we want to create the NNCPs, MetalLB CRs,
NetConfig CR and Net-attach-defs, but do NOT want to create the
OpenStackControlPlane.

Following this can this can be done by creating an automation file
with only two stages, one for NNCPs and the other for the other
networking components.

This change was created using the following PR as inspiration:
  openstack-k8s-operators#489

Jira: OSPRH-13801
@hjensas hjensas removed the do-not-merge Changes are not ready to be merged label Feb 12, 2025
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