Add CloudKitty to the services deployed by Telemetry by jlarriba · Pull Request #1614 · openstack-k8s-operators/openstack-operator

jlarriba · 2025-09-23T07:03:26Z

Add CloudKitty to openstack-operator for chargeback enablement

softwarefactory-project-zuul · 2025-09-23T07:03:36Z

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/telemetry-operator for 741,4869d57d3a447c77f5257df253a982c47c624bde

softwarefactory-project-zuul · 2025-09-23T07:13:40Z

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/telemetry-operator for 741,4869d57d3a447c77f5257df253a982c47c624bde

softwarefactory-project-zuul · 2025-09-23T08:42:07Z

This change depends on a change that failed to merge.

Change openstack-k8s-operators/telemetry-operator#741 is needed.

softwarefactory-project-zuul · 2025-09-23T10:03:52Z

This change depends on a change that failed to merge.

Change openstack-k8s-operators/telemetry-operator#741 is needed.

softwarefactory-project-zuul · 2025-09-23T13:54:12Z

This change depends on a change that failed to merge.

Change openstack-k8s-operators/telemetry-operator#741 is needed.

softwarefactory-project-zuul · 2025-09-29T10:07:36Z

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 1614,b6df833d72dffc98e1f306a707dfdc785afd546d

softwarefactory-project-zuul · 2025-09-30T07:54:03Z

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 1614,212247250cdc67ae3a726e1ad9588f30f564d73d

softwarefactory-project-zuul · 2025-09-30T07:54:41Z

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 1614,e0460ac95baa4f5c08692c60226588263814a5b9

softwarefactory-project-zuul · 2025-09-30T08:45:06Z

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 1614,a1c488fae9935ac4c7a06adbc83f0ca64bcf1604

softwarefactory-project-zuul · 2025-09-30T09:29:27Z

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 1614,70c8c8469d36710d3378443ffbd9b6887673e896

softwarefactory-project-zuul · 2025-09-30T11:30:38Z

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 1614,7f4a0684ff1ed2ee8f35880f8e04110cabb2aeee

softwarefactory-project-zuul · 2025-09-30T11:37:02Z

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 1614,e4561f35df9aab6b5c7e03aa7a5f756fe74a6b92

softwarefactory-project-zuul · 2025-11-20T08:38:59Z

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/04d4b9392cc446fbb6c6e9c250b0d301

❌ openstack-k8s-operators-content-provider FAILURE in 11m 46s
⚠️ 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
⚠️ adoption-standalone-to-crc-ceph-provider SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

stuggi

looks like there are go.mod bumps missing?

jlarriba · 2025-11-20T08:52:24Z

looks like there are go.mod bumps missing?

yes, I am trying to figure out the dependency tree fixes

elfiesmelfie · 2025-11-20T11:59:43Z

/retest-required

jlarriba · 2025-11-20T13:20:07Z

/retest

abays · 2025-11-20T17:20:50Z

/retest

elfiesmelfie · 2025-11-20T17:47:14Z

/lgtm

softwarefactory-project-zuul · 2025-11-20T18:09:27Z

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 27m 29s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 32m 22s
✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 40m 57s
❌ adoption-standalone-to-crc-ceph-provider FAILURE in 3h 09m 36s
✔️ openstack-operator-tempest-multinode SUCCESS in 1h 47m 14s

abays · 2025-11-20T18:52:29Z

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 27m 29s ✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 32m 22s ✔️ cifmw-crc-podified-edpm-baremetal SUCCESS in 1h 40m 57s ❌ adoption-standalone-to-crc-ceph-provider FAILURE in 3h 09m 36s ✔️ openstack-operator-tempest-multinode SUCCESS in 1h 47m 14s

Dataplane connectivity failure:

TASK [dataplane_adoption : verify connectivity to the existing test VM instance using Floating IP] ***

Will retry

abays · 2025-11-20T18:52:33Z

recheck

softwarefactory-project-zuul · 2025-11-20T18:59:49Z

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

❌ openstack-k8s-operators-content-provider FAILURE in 5m 27s
⚠️ 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
⚠️ adoption-standalone-to-crc-ceph-provider SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ openstack-operator-tempest-multinode SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider

elfiesmelfie · 2025-11-20T19:02:24Z

recheck

abays

/lgtm

openshift-ci · 2025-11-20T21:53:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: abays, jlarriba

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:

~~OWNERS~~ [abays]

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

jlarriba · 2025-11-21T07:49:58Z

/cherry-pick 18.0-fr4

openshift-cherrypick-robot · 2025-11-21T07:50:37Z

@jlarriba: #1614 failed to apply on top of branch "18.0-fr4":

Applying: Add CloudKitty to the services deployed by Telemetry
Using index info to reconstruct a base tree...
M	apis/bases/core.openstack.org_openstackcontrolplanes.yaml
M	apis/go.mod
M	apis/go.sum
M	bindata/crds/crds.yaml
M	bindata/crds/telemetry.openstack.org_telemetries.yaml
M	config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
M	config/operator/manager_operator_images.yaml
M	go.mod
M	go.sum
M	hack/export_operator_related_images.sh
Falling back to patching base and 3-way merge...
Auto-merging hack/export_operator_related_images.sh
CONFLICT (content): Merge conflict in hack/export_operator_related_images.sh
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging config/operator/manager_operator_images.yaml
CONFLICT (content): Merge conflict in config/operator/manager_operator_images.yaml
Auto-merging config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
Auto-merging bindata/crds/telemetry.openstack.org_telemetries.yaml
Auto-merging bindata/crds/crds.yaml
Auto-merging apis/go.sum
CONFLICT (content): Merge conflict in apis/go.sum
Auto-merging apis/go.mod
CONFLICT (content): Merge conflict in apis/go.mod
Auto-merging apis/bases/core.openstack.org_openstackcontrolplanes.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Add CloudKitty to the services deployed by Telemetry

Details

In response to this:

/cherry-pick 18.0-fr4

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

openshift-ci Bot requested review from abays and olliewalsh September 23, 2025 07:03

openshift-merge-robot added the needs-rebase label Sep 23, 2025

openshift-merge-robot removed the needs-rebase label Sep 23, 2025

jlarriba force-pushed the cloudkitty branch from bdccc2f to f96223b Compare September 23, 2025 09:24

jlarriba force-pushed the cloudkitty branch 3 times, most recently from f5f8523 to 05c41e1 Compare September 23, 2025 11:38

elfiesmelfie mentioned this pull request Sep 24, 2025

[zuul] Add a CloudKitty CI job openstack-k8s-operators/telemetry-operator#720

Merged

openshift-merge-robot added the needs-rebase label Sep 29, 2025

jlarriba force-pushed the cloudkitty branch from b6df833 to 2122472 Compare September 30, 2025 07:53

jlarriba force-pushed the cloudkitty branch from 2122472 to e0460ac Compare September 30, 2025 07:54

jlarriba force-pushed the cloudkitty branch from e0460ac to a1c488f Compare September 30, 2025 08:44

jlarriba force-pushed the cloudkitty branch from a1c488f to 70c8c84 Compare September 30, 2025 09:29

jlarriba force-pushed the cloudkitty branch 2 times, most recently from 542d166 to 7f4a068 Compare September 30, 2025 11:30

jlarriba force-pushed the cloudkitty branch from 7f4a068 to e4561f3 Compare September 30, 2025 11:36

jlarriba force-pushed the cloudkitty branch from e4561f3 to d08b934 Compare September 30, 2025 13:32

elfiesmelfie changed the title ~~[DNM] Add CloudKitty to the services deployed by Telemetry~~ Add CloudKitty to the services deployed by Telemetry Nov 19, 2025

elfiesmelfie changed the title ~~Add CloudKitty to the services deployed by Telemetry~~ [DNM] Add CloudKitty to the services deployed by Telemetry Nov 19, 2025

jlarriba changed the title ~~[DNM] Add CloudKitty to the services deployed by Telemetry~~ Add CloudKitty to the services deployed by Telemetry Nov 20, 2025

stuggi reviewed Nov 20, 2025

View reviewed changes

Comment thread config/operator/manager_operator_images.yaml Outdated

Comment thread hack/export_operator_related_images.sh Outdated

Comment thread pkg/openstack/version.go Outdated

jlarriba force-pushed the cloudkitty branch 2 times, most recently from 05b8669 to 0cccd70 Compare November 20, 2025 09:59

jlarriba force-pushed the cloudkitty branch from 0cccd70 to 5b0104f Compare November 20, 2025 13:19

jlarriba force-pushed the cloudkitty branch from 5b0104f to b86e04f Compare November 20, 2025 14:14

Add CloudKitty to the services deployed by Telemetry

470490c

jlarriba force-pushed the cloudkitty branch from b86e04f to 470490c Compare November 20, 2025 14:40

openshift-ci Bot assigned elfiesmelfie Nov 20, 2025

openshift-ci Bot added the lgtm label Nov 20, 2025

abays approved these changes Nov 20, 2025

View reviewed changes

openshift-ci Bot assigned abays Nov 20, 2025

openshift-ci Bot added the approved label Nov 20, 2025

openshift-merge-bot Bot merged commit c4e96a7 into openstack-k8s-operators:main Nov 20, 2025
10 checks passed

Conversation

jlarriba commented Sep 23, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

softwarefactory-project-zuul Bot commented Sep 23, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 23, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 23, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 23, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 23, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 29, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Sep 30, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Nov 20, 2025

Uh oh!

stuggi left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jlarriba commented Nov 20, 2025

Uh oh!

elfiesmelfie commented Nov 20, 2025

Uh oh!

jlarriba commented Nov 20, 2025

Uh oh!

abays commented Nov 20, 2025

Uh oh!

elfiesmelfie commented Nov 20, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Nov 20, 2025

Uh oh!

abays commented Nov 20, 2025

Uh oh!

abays commented Nov 20, 2025

Uh oh!

softwarefactory-project-zuul Bot commented Nov 20, 2025

Uh oh!

elfiesmelfie commented Nov 20, 2025

Uh oh!

abays left a comment

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Nov 20, 2025

Uh oh!

Uh oh!

jlarriba commented Nov 21, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 21, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jlarriba commented Sep 23, 2025 •

edited

Loading