Skip to content

Placement integration v5#1101

Open
auniyal61 wants to merge 667 commits intoopenstack-k8s-operators:mainfrom
auniyal61:placement-integration-v5
Open

Placement integration v5#1101
auniyal61 wants to merge 667 commits intoopenstack-k8s-operators:mainfrom
auniyal61:placement-integration-v5

Conversation

@auniyal61
Copy link
Copy Markdown
Contributor

Merge placement-operator/main into nova-operator with git history

mrkisaolamb and others added 30 commits January 11, 2024 18:24
Resources created by the placement-operator are
named based on the name of the PlacementAPI CR
Make sure that DeploymentReady condition is set back to False
if the Deployment ReadyReplicas falls back to 0
Public/Internal service cert secrets and the CA bundle secret
can be passed to configure httpd virtual hosts for tls termination.
The certs are mounted to in
var/lib/config-data/tls/certs/%s.crt|key and a CA bundle to
/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem.
Server cert and key are intended to be moved by kolla to
/etc/pki/tls/certs|private.

Depends-On: openstack-k8s-operators/lib-common#428

Signed-off-by: Veronika Fisarova <vfisarov@redhat.com>
Our intention is to track service operator and lib-common dependencies
via pseudoversions. However renovate does not automatically bump from a
tagged version (e.g. v0.3.0) to a newer but not tagged pseudoversion. So
this patch does the manual bump. After this renovate will bump the newer
pseduoversions.
These fields were redundant. Crashing pods can be debugged via oc debug.

Implements: OSPRH-4290
Adapt to the new version by:

* adding RBAC rules for MariaDBAccount manipulation
* adding Own(MariaDBAccount) to detect status changes
* separating PlacementAPI CR name from the schema and
  MariaDBDatabase/Account name
* adapting test to simulate MariaDBAccount success
* adapting to new DB hostnames due to the mariadb TLS feature
This change modifies how the operator is built to use
the ubi9 base image and golang tool chain.

A new GO_BUILD_EXTRA_ENV_ARGS build arg is added to the dockerfile
to enable the build system to inject addtional parmaters.
the default value enable dynmaic linking of glibc which is required
for FIPS

The prow_ci.env file is extended to enable fips checkign in the
prow image build job to validate this change.

The Makefile is extened to allow passing build args to docker-build
We only want to support the policy.yaml file passthrough for
PlacementAPI

The kolla config files are modified to move the supported files in place.

Implements: OSPRH-2503
Signed-off-by: Brendan Shephard <bshephar@redhat.com>
This change updates the webhook functions to comply with the new
standard for controller-runtime.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
This change updates the manager intialisation to comply with the new controller-runtime schema.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
This change fixes the Watches declarations to comply with the new
controller-runtime standards

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
Signed-off-by: Brendan Shephard <bshephar@redhat.com>
…rators/revert-144-controller-runtime

Revert "Controller runtime update"
This change updates the webhook functions to comply with the new
standard for controller-runtime.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
This change updates the manager intialisation to comply with the new controller-runtime schema.

Signed-off-by: Brendan Shephard <bshephar@redhat.com>
Update kustomization.yaml to include placement samples
Update controller-gen paths to process both nova and placement APIs
  - Register PlacementAPI controller in cmd/main.go
  - Register PlacementAPI webhook in cmd/main.go
  - Add placement scheme and defaults initialization
  - Fix placement test paths after moving to test/functional/placement/
  - Add placement API to test coverage in Makefile
Updated Makefile to include placement webhook paths in controller-gen
Adds getTemplateInstanceType in placement/common.go
Remove placement-import directory - all code has been moved
Add generated files from 'make manifests
@openshift-ci openshift-ci bot requested review from SeanMooney and gibizer April 15, 2026 06:13
@softwarefactory-project-zuul
Copy link
Copy Markdown

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/nova-operator for 1101,b54a701efcaf51fb43e59bca78c890dbf09149aa

@gibizer
Copy link
Copy Markdown
Contributor

gibizer commented Apr 15, 2026

/hold need testing

gibizer
gibizer previously approved these changes Apr 15, 2026
Copy link
Copy Markdown
Contributor

@gibizer gibizer left a comment

Choose a reason for hiding this comment

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

This is not a real approval just testing if github would allow manually merging this if the approval is persent.

@gibizer
Copy link
Copy Markdown
Contributor

gibizer commented Apr 15, 2026

❯ git fetch origin pull/1101/head:pr-1101-merge
X11 forwarding request failed on channel 0
remote: Enumerating objects: 75, done.
remote: Counting objects: 100% (75/75), done.
remote: Compressing objects: 100% (35/35), done.
remote: Total 75 (delta 32), reused 75 (delta 32), pack-reused 0 (from 0)
Unpacking objects: 100% (75/75), 21.19 KiB | 748.00 KiB/s, done.
From github.com:openstack-k8s-operators/nova-operator
 * [new ref]           refs/pull/1101/head -> pr-1101-merge
❯ git merge pr-1101-merge
Updating b59b2a22..b54a701e
Fast-forward

The merge of this is clean now.

@gibizer
Copy link
Copy Markdown
Contributor

gibizer commented Apr 15, 2026

OK. Github now agrees that it is mergable.

So what remains:

  • do testing of the PR both greenfield and update testing
  • review the commits in the PR that are new. Ignore the commits that are just the same from placement-operator review
  • line up an openstack-operator patch that rewires the imports and removes the deployment of controllers from placement-operator repo.

Then based on the code review and the manual tests we will override the CI here as zuul is insisting on trying a rebase before testing.

@gibizer gibizer self-requested a review April 15, 2026 07:51
@gibizer gibizer dismissed their stale review April 15, 2026 07:52

it was not a real approval just a github test

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 15, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: auniyal61

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

The pull request process is described here

Details 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

@gibizer
Copy link
Copy Markdown
Contributor

gibizer commented Apr 15, 2026

recheck

@softwarefactory-project-zuul
Copy link
Copy Markdown

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/nova-operator for 1101,b54a701efcaf51fb43e59bca78c890dbf09149aa

@auniyal61
Copy link
Copy Markdown
Contributor Author

OK. Github now agrees that it is mergable.

So what remains:

  • do testing of the PR both greenfield and update testing

you mean manual build test ?
functional tests are running

  • will run kuttl locally
  • will do day-2 operation after build
  • review the commits in the PR that are new. Ignore the commits that are just the same from placement-operator review
  • line up an openstack-operator patch that rewires the imports and removes the deployment of controllers from placement-operator repo.

yep, inprogress.

Then based on the code review and the manual tests we will override the CI here as zuul is insisting on trying a rebase before testing.


still showing, so will we eventually merge manually ?

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/nova-operator for 1101,b54a701efcaf51fb43e59bca78c890dbf09149aa

@gibizer
Copy link
Copy Markdown
Contributor

gibizer commented Apr 15, 2026

OK. Github now agrees that it is mergable.
So what remains:

  • do testing of the PR both greenfield and update testing

you mean manual build test ? functional tests are running

  • will run kuttl locally
  • will do day-2 operation after build

Yepp.

  • run kuttl localy post the result
  • build the nova-operator and an openstack-operator using this PR and the openstack-operator adaptation PR, do a greenfiled deployment with it locally (e.g. with install_yamls) do some spot checks that VMs can be booted etc. Check that placement-operator is not deployed, check that placement controller is running from nova-operator
  • do a deployment with the official nova- and placement- and openstack-operator. Do an update that brings in a new openstack-operator with the adaptation patch. Check that placement-operator is removed by the update, check the placement controllers are running from nova-operator. Do spot checks that VMs are manageable.
  • review the commits in the PR that are new. Ignore the commits that are just the same from placement-operator review

I will spend time on this part.

  • line up an openstack-operator patch that rewires the imports and removes the deployment of controllers from placement-operator repo.

yep, inprogress.

Then based on the code review and the manual tests we will override the CI here as zuul is insisting on trying a rebase before testing.

still showing, so will we eventually merge manually ?

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/nova-operator for 1101,b54a701efcaf51fb43e59bca78c890dbf09149aa

Yes, based on the manual test results and code review I will approve this PR and then I will press the button in Github to merge it against the CI results. Then we will post a DNM PR to trigger CI on the new main.

auniyal61 added a commit to auniyal61/openstack-operator that referenced this pull request Apr 15, 2026
Replace placement-operator dependency with nova-operator's placement API
now that placement code has been integrated into nova-operator

- Update all imports from placement-operator/api to nova-operator/api/placement
- Remove placement-operator from go.mod and api/go.mod dependencies
- Update nova-operator dependency to placement-integration-v5
- Add replace directives pointing to auniyal61/nova-operator fork (temporary)
- Clean up go.sum files to remove stale placement-operator entries

Depends-On: openstack-k8s-operators/nova-operator#1101
auniyal61 added a commit to auniyal61/openstack-operator that referenced this pull request Apr 15, 2026
Replace placement-operator dependency with nova-operator's placement API
now that placement code has been integrated into nova-operator

- Update all imports from placement-operator/api to nova-operator/api/placement
- Remove placement-operator from go.mod and api/go.mod dependencies
- Update nova-operator dependency to placement-integration-v5
- Add replace directives pointing to auniyal61/nova-operator fork (temporary)
- Clean up go.sum files to remove stale placement-operator entries

Depends-On: openstack-k8s-operators/nova-operator#1101
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.