Consolidate Ansibleee controller logic

[bshephar]

This change consolidates the openstack-ansibleee-operator logic into the openstack-operator. The openstack-ansibleee-operator currently is a full operator just to create Kubernetes jobs. It would be better if this functionality was just included with the rest of the dataplane code. This change keeps the controller, but runs it under the openstack-operator instead of standalone.

Jira: https://issues.redhat.com/browse/OSPRH-8718

[openshift-ci[bot]]

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

[openshift-ci[bot]]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bshephar

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: - ~~[OWNERS](https://github.com/openstack-k8s-operators/openstack-operator/blob/main/OWNERS)~~ [bshephar] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment

[softwarefactory-project-zuul[bot]]

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/5693549754ba40be9bcc7a2a2741c625

:x: openstack-k8s-operators-content-provider FAILURE in 13m 23s :warning: podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-data-plane-adoption-osp-17-to-extracted-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

[softwarefactory-project-zuul[bot]]

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/2e370820c5174df3b8822b1781235c24

:x: openstack-k8s-operators-content-provider FAILURE in 13m 25s :warning: podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-data-plane-adoption-osp-17-to-extracted-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

[softwarefactory-project-zuul[bot]]

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/dbafda1694c042db83d3898a5f8ccef0

:x: openstack-k8s-operators-content-provider FAILURE in 14m 04s :warning: podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-data-plane-adoption-osp-17-to-extracted-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

[softwarefactory-project-zuul[bot]]

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/4e992ef22759452585a8a2d2aca21e22

:x: openstack-k8s-operators-content-provider FAILURE in 14m 24s :warning: podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-data-plane-adoption-osp-17-to-extracted-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

[softwarefactory-project-zuul[bot]]

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/a242d2484ac94f10bc53e5a634d161e6

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 1h 31m 09s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 08m 32s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 12m 08s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 1h 14m 01s :x: openstack-operator-tempest-multinode FAILURE in 1h 14m 42s

[softwarefactory-project-zuul[bot]]

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/b0366573b6864eefa9ab43d812e30ea6

:x: openstack-k8s-operators-content-provider FAILURE in 4m 53s :warning: podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-crc-podified-edpm-baremetal SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: cifmw-data-plane-adoption-osp-17-to-extracted-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider :warning: openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

[bshephar]

recheck

[softwarefactory-project-zuul[bot]]

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/4beb310275b4402881685843f8a2e70b

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 43m 04s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 41m 12s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 34m 28s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 2h 27m 56s :x: openstack-operator-tempest-multinode FAILURE in 1h 46m 17s

[bshephar]

recheck

[softwarefactory-project-zuul[bot]]

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/2404670933924ef0855b9b76ce78b47a

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 40m 12s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 40m 45s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 43m 11s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 2h 22m 04s :x: openstack-operator-tempest-multinode FAILURE in 1h 48m 41s

[softwarefactory-project-zuul[bot]]

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

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 54m 05s :x: podified-multinode-edpm-deployment-crc FAILURE in 31m 31s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 32m 16s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 38m 10s :x: openstack-operator-tempest-multinode FAILURE in 36m 15s

[softwarefactory-project-zuul[bot]]

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/a0e0bec65546471eb59726b7b20bdd21

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 02m 30s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 40m 17s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 57m 50s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 1h 38m 57s :x: openstack-operator-tempest-multinode FAILURE in 1h 46m 48s

[softwarefactory-project-zuul[bot]]

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/aadfbff7c589442381cf4af42fa57bd9

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 04m 00s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 46m 13s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 45m 13s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 1h 50m 15s :x: openstack-operator-tempest-multinode RETRY_LIMIT in 8m 55s

[softwarefactory-project-zuul[bot]]

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/2749d5dcd02d46f78249b212ff2d9ba5

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 45m 02s :x: podified-multinode-edpm-deployment-crc FAILURE in 1h 41m 39s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 41m 47s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 2h 27m 53s :x: openstack-operator-tempest-multinode FAILURE in 28m 55s

[bshephar]

Still got an RBAC issue here:

2024-07-20T04:03:49.689Z    ERROR   Status update failed    {"controller": "openstackansibleee", "controllerGroup": "ansibleee.openstack.org", "controllerKind": "OpenStackAnsibleEE", "OpenStackAnsibleEE": {"name":"repo-setup-edpm-deployment-openstack-edpm-ipam","namespace":"openstack"}, "namespace": "openstack", "name": "repo-setup-edpm-deployment-openstack-edpm-ipam", "reconcileID": "8519a76a-2bb3-4c62-aa1f-d0e234dfe52e", "error": "openstackansibleees.ansibleee.openstack.org \"repo-setup-edpm-deployment-openstack-edpm-ipam\" is forbidden: User \"system:serviceaccount:openstack-operators:openstack-operator-controller-manager\" cannot patch resource \"openstackansibleees/status\" in API group \"ansibleee.openstack.org\" in the namespace \"openstack\""}
github.com/openstack-k8s-operators/lib-common/modules/common/helper.(*Helper).PatchInstance
    /opt/app-root/src/go/pkg/mod/github.com/openstack-k8s-operators/lib-common/modules/common@v0.4.1-0.20240715111029-358ba8041494/helper/helper.go:225
github.com/openstack-k8s-operators/openstack-operator/controllers/ansibleee.(*OpenStackAnsibleEEReconciler).Reconcile.func1
    /remote-source/controllers/ansibleee/openstack_ansibleee_controller.go:124
github.com/openstack-k8s-operators/openstack-operator/controllers/ansibleee.(*OpenStackAnsibleEEReconciler).Reconcile
    /remote-source/controllers/ansibleee/openstack_ansibleee_controller.go:167
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Reconcile
    /opt/app-root/src/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.16.6/pkg/internal/controller/controller.go:119
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).reconcileHandler
    /opt/app-root/src/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.16.6/pkg/internal/controller/controller.go:316
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).processNextWorkItem
    /opt/app-root/src/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.16.6/pkg/internal/controller/controller.go:266
sigs.k8s.io/controller-runtime/pkg/internal/controller.(*Controller).Start.func2.2
    /opt/app-root/src/go/pkg/mod/sigs.k8s.io/controller-runtime@v0.16.6/pkg/internal/controller/controller.go:227

[bshephar]

recheck

[softwarefactory-project-zuul[bot]]

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/61dafa4300824837bcbdfdb17d40ad85

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 40m 10s :x: podified-multinode-edpm-deployment-crc FAILURE in 26m 09s :x: cifmw-crc-podified-edpm-baremetal RETRY_LIMIT in 9m 50s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc FAILURE in 2h 24m 38s :x: openstack-operator-tempest-multinode FAILURE in 28m 27s

[bshephar]

recheck

[bshephar]

Unrelated failure in redhat-operators marketplace

[bshephar]

  stderr: |-
    timed out waiting for the condition on pods/certified-operators-j72vz
    timed out waiting for the condition on pods/certified-operators-s9m9b
    timed out waiting for the condition on pods/community-operators-nm9f9
    timed out waiting for the condition on pods/community-operators-qsdxj
    timed out waiting for the condition on pods/marketplace-operator-8b455464d-2wg58
    timed out waiting for the condition on pods/redhat-marketplace-fnk59
    timed out waiting for the condition on pods/redhat-marketplace-g9bwq
    timed out waiting for the condition on pods/redhat-operators-bnp45
    timed out waiting for the condition on pods/redhat-operators-plcgt

[softwarefactory-project-zuul[bot]]

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/67096e53739a49c98253c2ab56a4e53c

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 2h 38m 13s :x: podified-multinode-edpm-deployment-crc FAILURE in 24m 41s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 31m 02s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc POST_FAILURE in 2h 21m 53s :x: openstack-operator-tempest-multinode FAILURE in 1h 46m 59s

[softwarefactory-project-zuul[bot]]

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/54c84570ffd4406f929d73d1d855bfc5

:heavy_check_mark: openstack-k8s-operators-content-provider SUCCESS in 1h 48m 46s :x: podified-multinode-edpm-deployment-crc FAILURE in 25m 36s :x: cifmw-crc-podified-edpm-baremetal FAILURE in 1h 34m 08s :x: cifmw-data-plane-adoption-osp-17-to-extracted-crc RETRY_LIMIT in 31m 13s :x: openstack-operator-tempest-multinode FAILURE in 27m 46s

[bshephar]

I think I'll close this one and we'll just completely remove the AEE CR. We can just replace the entire thing by directly creating jobs from the Dataplane controllers

[fao89]

+1 to create jobs from dataplane controllers