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

Set edpmRoleServiceName for nova-custom-ceph #1757

Merged
merged 2 commits into from
May 29, 2024

Conversation

stuggi
Copy link
Contributor

@stuggi stuggi commented May 23, 2024

This is now required after
openstack-k8s-operators/edpm-ansible#658 has
merged.

Jira: OSPRH-7257

Depends-On: openstack-k8s-operators/dataplane-operator#896
Depends-On: openstack-k8s-operators/openstack-operator#814

As a pull request owner and reviewers, I checked that:

  • Appropriate testing is done and actually running
  • Appropriate documentation exists and/or is up-to-date:
    • README in the role
    • Content of the docs/source is reflecting the changes

This is now required after
openstack-k8s-operators/edpm-ansible#658 has
merged.

Jira: OSPRH-7257
@github-actions github-actions bot marked this pull request as draft May 23, 2024 12:44
Copy link

Thanks for the PR! ❤️
I'm marking it as a draft, once your happy with it merging and the PR is passing CI, click the "Ready for review" button below.

@stuggi
Copy link
Contributor Author

stuggi commented May 23, 2024

I have added this as a dep on openstack-k8s-operators/nova-operator#756 to test. still queued

@@ -20,4 +20,5 @@ spec:
networks:
- ctlplane
issuer: osp-rootca-issuer-internal
edpmRoleServiceName: nova
Copy link
Contributor

Choose a reason for hiding this comment

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

note that this requries a crd chnage which will not be backported to beta
so this patch should not be cherry-picked to beta either.

Copy link
Contributor

Choose a reason for hiding this comment

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

this does look correct however althoug hwe may end up renaming or moving this again in the future.
assuming https://review.rdoproject.org/zuul/stream/7135c8022b7840218dbecbce35c59d26?logfile=console.log passes then i think we can proceed with this to unblock ci.

Copy link
Contributor

@SeanMooney SeanMooney May 23, 2024

Choose a reason for hiding this comment

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

looking at

the output this only modifies the ceph specific version

the "default" nova-custom service does not define the edpmRoleServiceName: nova field

2024-05-23 12:36:49.367446 | controller |     - apiVersion: dataplane.openstack.org/v1beta1
2024-05-23 12:36:49.367450 | controller |       kind: OpenStackDataPlaneService
2024-05-23 12:36:49.367454 | controller |       metadata:
2024-05-23 12:36:49.367458 | controller |         labels:
2024-05-23 12:36:49.367463 | controller |           created-by: install_yamls
2024-05-23 12:36:49.367467 | controller |         name: nova-custom
2024-05-23 12:36:49.367471 | controller |         namespace: openstack
2024-05-23 12:36:49.367475 | controller |       spec:
2024-05-23 12:36:49.367480 | controller |         caCerts: combined-ca-bundle
2024-05-23 12:36:49.367485 | controller |         configMaps:
2024-05-23 12:36:49.367491 | controller |         - nova-extra-config
2024-05-23 12:36:49.367497 | controller |         containerImageFields:
2024-05-23 12:36:49.367503 | controller |         - NovaComputeImage
2024-05-23 12:36:49.367508 | controller |         - EdpmIscsidImage
2024-05-23 12:36:49.367514 | controller |         playbook: osp.edpm.nova
2024-05-23 12:36:49.367519 | controller |         secrets:
2024-05-23 12:36:49.367523 | controller |         - nova-cell1-compute-config
2024-05-23 12:36:49.367528 | controller |         - nova-migration-ssh-key

so we probably need to tweak

https://github.com/openstack-k8s-operators/install_yamls/blob/4f8ade9351e16f9acda19c139808765dde447a79/scripts/gen-nova-custom-dataplane-service.sh#L20-L33

or update

https://github.com/openstack-k8s-operators/dataplane-operator/blob/main/config/services/dataplane_v1beta1_openstackdataplaneservice_nova.yaml

which would be the better change to include edpmRoleServiceName: nova as well.

what you proposed should be enough for the ceph job

Copy link

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/40e57404f95e40f2ba86f9540775b0d5

openstack-k8s-operators-content-provider POST_FAILURE in 2h 28m 27s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 21m 13s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 16m 44s
podified-multinode-hci-deployment-crc FAILURE in 1h 31m 41s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 59s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 00s
✔️ cifmw-molecule-hci_prepare SUCCESS in 4m 53s

@slagle
Copy link
Contributor

slagle commented May 23, 2024

Looks like this will also be needed to correct the paths for the CA mounts as well:
openstack-k8s-operators/dataplane-operator#896
The related architecture PR is openstack-k8s-operators/architecture#247

gibizer added a commit to gibizer/nova-operator that referenced this pull request May 27, 2024
gibizer added a commit to gibizer/nova-operator that referenced this pull request May 27, 2024
gibizer added a commit to gibizer/nova-operator that referenced this pull request May 27, 2024
gibizer added a commit to gibizer/nova-operator that referenced this pull request May 27, 2024
openshift-merge-bot bot pushed a commit to openstack-k8s-operators/nova-operator that referenced this pull request May 27, 2024
@slagle slagle marked this pull request as ready for review May 28, 2024 12:29
@lewisdenny
Copy link
Collaborator

Dequeued GitHub Check pipeline

@lewisdenny
Copy link
Collaborator

recheck

Copy link

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/5f06cda44ad0449d974ea1be64317dea

openstack-k8s-operators-content-provider FAILURE in 10m 52s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ podified-multinode-hci-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 54s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 45s
✔️ cifmw-molecule-hci_prepare SUCCESS in 4m 59s

@lewisdenny
Copy link
Collaborator

Adding depends on for https://github.com/openstack-k8s-operators/openstack-operator/pull/814 due to function test failing on content provider.

The function passed to Eventually failed at /home/zuul/go/pkg/mod/github.com/openstack-k8s-operators/lib-common/modules/[email protected]/test/helpers/conditions.go:49 with:

@lewisdenny
Copy link
Collaborator

recheck

@lewisdenny
Copy link
Collaborator

Killing me:

+ ansible-galaxy collection install --upgrade --force /workspace/src/github.com/openstack-k8s-operators/ci-framework/scripts/../
[....]
ERROR! Failed to clone a Git repository from `[https://github.com/ansible-collections/community.general`.](https://github.com/ansible-collections/community.general%60.)

@lewisdenny
Copy link
Collaborator

Letting it run because the job we're interested in should still pass

@pablintino
Copy link
Collaborator

/approve

Copy link
Contributor

openshift-ci bot commented May 28, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: pablintino

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

The pull request process is described 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

Copy link

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/843edb0eb2564fbdbd473b554bee1a30

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 36m 49s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 20m 07s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 13m 01s
✔️ podified-multinode-hci-deployment-crc SUCCESS in 1h 47m 50s
✔️ noop SUCCESS in 0s
cifmw-pod-ansible-test FAILURE in 4m 50s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 05s
✔️ cifmw-molecule-hci_prepare SUCCESS in 5m 01s

@slagle
Copy link
Contributor

slagle commented May 28, 2024

recheck

ERROR! Failed to clone a Git repository from https://github.com/ansible-collections/community.general

the 2 crc jobs passed however, so otherwise this looks good to merge

@rlandy
Copy link
Collaborator

rlandy commented May 28, 2024

/lgtm

Copy link

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/57baf831e41a411aaca309fba1e6b961

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 03m 37s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 25m 50s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 27m 37s
podified-multinode-hci-deployment-crc FAILURE in 1h 37m 27s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 9m 05s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 16s
✔️ cifmw-molecule-hci_prepare SUCCESS in 4m 56s

@viroel
Copy link
Contributor

viroel commented May 28, 2024

We need openstack-k8s-operators/openstack-operator#811 merged, since dependencies already merged, so job will pick latest dataplane-operator

@rlandy
Copy link
Collaborator

rlandy commented May 29, 2024

recheck

@openshift-merge-bot openshift-merge-bot bot merged commit 24080df into openstack-k8s-operators:main May 29, 2024
8 of 9 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants