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

Support new OpenStack initialization resource for RHOSO install #2549

Merged
merged 1 commit into from
Dec 20, 2024

Conversation

abays
Copy link
Contributor

@abays abays commented Nov 18, 2024

We have a new upcoming way to install and deploy the OSP operators. OLM will only install one CRD for OSP, which is an initialization resource. A CR must be created for that CRD, which then, when created, causes all the remaining OSP CRDs to be installed and also deploys their respective operators.

Copy link
Contributor

openshift-ci bot commented Nov 18, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1185,25deedd5f864eff6f094ab4dcd4fb93f6adc9da3

@abays
Copy link
Contributor Author

abays commented Nov 18, 2024

I have tested this with VA1 and a custom build of the new OpenStack operator that uses the new paradigm. The deployment was succesful, even all the way through Tempest.

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1185,9170f766fe8a63da6804cc953c37224d09856ce5

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1185,9170f766fe8a63da6804cc953c37224d09856ce5

@pablintino
Copy link
Collaborator

/approve

Copy link
Contributor

openshift-ci bot commented Dec 4, 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

@openshift-ci openshift-ci bot added the approved label Dec 4, 2024
Copy link
Collaborator

@lewisdenny lewisdenny left a comment

Choose a reason for hiding this comment

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

Hi @abays

I assume we will need to support the new and old method of installing RHOSO?

If so, could you please explain how that will be handled as we don't really version ci-framework.

@abays
Copy link
Contributor Author

abays commented Dec 5, 2024

Hi @abays

I assume we will need to support the new and old method of installing RHOSO?

If so, could you please explain how that will be handled as we don't really version ci-framework.

That's a good point. CIFMW will still need to deploy older releases. So I will need to add some sort of conditional logic that detects whether the new Openstack CRD is available and then branches from there.

@abays abays marked this pull request as draft December 5, 2024 09:31
@abays abays force-pushed the osp_init branch 4 times, most recently from 0028939 to c663657 Compare December 5, 2024 14:17
@abays abays marked this pull request as ready for review December 5, 2024 17:43
@dprince
Copy link

dprince commented Dec 18, 2024

code here looks good to me. Thanks abays

@abays
Copy link
Contributor Author

abays commented Dec 18, 2024

@pablintino @lewisdenny With openstack-k8s-operators/install_yamls#981 merged, we now have Prow all set to handle both old and new OpenStack operator install paradigms. If we can get this PR merged, then we should be in the same situation for Zuul. I'll keep an eye on the Zuul jobs here to try to get them to pass. I don't think the recent failures have been related to my changes.

- _cifmw_kustomize_deploy_olm_osp_operator_openstack_crd_out.resources is defined
- (_cifmw_kustomize_deploy_olm_osp_operator_openstack_crd_out.resources | length) > 0
vars:
make_openstack_env: "{{ cifmw_edpm_prepare_common_env |
Copy link
Collaborator

Choose a reason for hiding this comment

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

Typo: make_openstack_env should be make_openstack_init_env

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 05m 00s
podified-multinode-edpm-deployment-crc FAILURE in 30m 21s
cifmw-crc-podified-edpm-baremetal FAILURE in 36m 41s
adoption-standalone-to-crc-ceph-provider RETRY_LIMIT in 38m 20s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 7m 50s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 13s
✔️ cifmw-architecture-validate-hci SUCCESS in 4m 06s
✔️ build-push-container-cifmw-client SUCCESS in 37m 02s
✔️ cifmw-molecule-edpm_prepare SUCCESS in 4m 30s
✔️ cifmw-molecule-kustomize_deploy SUCCESS in 4m 20s

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 06m 35s
podified-multinode-edpm-deployment-crc FAILURE in 29m 51s
cifmw-crc-podified-edpm-baremetal FAILURE in 39m 05s
adoption-standalone-to-crc-ceph-provider RETRY_LIMIT in 35m 15s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 19s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 16s
✔️ cifmw-architecture-validate-hci SUCCESS in 4m 01s
✔️ build-push-container-cifmw-client SUCCESS in 37m 54s
✔️ cifmw-molecule-edpm_prepare SUCCESS in 4m 58s
✔️ cifmw-molecule-kustomize_deploy SUCCESS in 4m 16s

@abays abays force-pushed the osp_init branch 2 times, most recently from 26776bc to 8e61334 Compare December 18, 2024 18:07
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://softwarefactory-project.io/zuul/t/rdoproject.org/buildset/5218f089e82c43d0b1c2bd4175b21dab

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 11m 34s
podified-multinode-edpm-deployment-crc FAILURE in 33m 04s
cifmw-crc-podified-edpm-baremetal FAILURE in 35m 15s
adoption-standalone-to-crc-ceph-provider RETRY_LIMIT in 37m 50s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 33s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 43s
✔️ cifmw-architecture-validate-hci SUCCESS in 3m 57s
✔️ build-push-container-cifmw-client SUCCESS in 37m 27s
✔️ cifmw-molecule-edpm_prepare SUCCESS in 4m 26s
✔️ cifmw-molecule-kustomize_deploy SUCCESS in 4m 16s

@abays
Copy link
Contributor Author

abays commented Dec 18, 2024

The latest failures are indeed caused by my changes, but I am confused how they are happening. The issue is that make openstack_init and make openstack_deploy_prep both now call make openstack_repo. make openstack_repo fails if it was called before, because the existing Git clone will be on the local filesystem and it errors out while complaining about the dir not being empty. But in the current job, make openstack_init should not be being called, because we check if the new OpenStack initialization CRD exists and only actually call make openstack_init if it does [1]. Yet, somehow the logs show that CIFMW is running openstack_init:

TASK [install_yamls_makes : Run openstack_init output_dir={{ cifmw_basedir|default(ansible_user_dir ~ '/ci-framework-data') }}/artifacts, chdir=/home/zuul/src/github.com/openstack-k8s-operators/install_yamls, script=make openstack_init, dry_run={{ make_openstack_init_dryrun|default(false)|bool }}, extra_args={{ dict((make_openstack_init_env|default({})), **(make_openstack_init_params|default({}))) }}] ***
Wednesday 18 December 2024  14:28:52 -0500 (0:00:00.025)       0:08:29.117 **** 
[WARNING]: conditional statements should not include jinja2 templating
delimiters such as {{ }} or {% %}. Found: {{ make_openstack_init_until |
default(true) }}
Follow script's output here: /home/zuul/ci-framework-data/logs/ci_script_005_run_openstack.log
changed: [localhost]

Maybe there's something wrong with [1], but it succeeded earlier this week and I haven't changed it other than to rename [2]...but maybe that did it?

[1] https://github.com/abays/ci-framework/blob/8e613342016c94a6bc90df0c3c5fa238d6e26367/roles/edpm_prepare/tasks/main.yml#L122-L148
[2] https://github.com/abays/ci-framework/blob/8e613342016c94a6bc90df0c3c5fa238d6e26367/roles/edpm_prepare/tasks/main.yml#L142-L143

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1185,7d4e47de0d51963b9e935c0f97184bcede5a6be7

Copy link

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/openstack-operator for 1185,7d4e47de0d51963b9e935c0f97184bcede5a6be7

@abays
Copy link
Contributor Author

abays commented Dec 19, 2024

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 4h 12m 34s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 21m 00s
cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 21m 21s
✔️ adoption-standalone-to-crc-ceph-provider SUCCESS in 3h 01m 29s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-ansible-test SUCCESS in 8m 47s
✔️ cifmw-pod-pre-commit SUCCESS in 7m 31s
✔️ cifmw-architecture-validate-hci SUCCESS in 4m 04s
✔️ build-push-container-cifmw-client SUCCESS in 37m 10s
✔️ cifmw-molecule-edpm_prepare SUCCESS in 4m 24s
✔️ cifmw-molecule-kustomize_deploy SUCCESS in 4m 41s

@abays
Copy link
Contributor Author

abays commented Dec 19, 2024

recheck

@frenzyfriday
Copy link
Contributor

/lgtm

@openshift-merge-bot openshift-merge-bot bot merged commit fc30400 into openstack-k8s-operators:main Dec 20, 2024
4 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.

6 participants