Add CloudKitty deployment to telemetry-operator #741

jlarriba · 2025-08-26T08:49:38Z

This PR is not ready to merge yet on main. It is intended to debug the precommit issues and to give a platform so the CI jobs can start to be developed, but we cannot merge it until the upstream cloudkitty changes have been merged (https://review.opendev.org/c/openstack/cloudkitty/+/950868)

Depends-On: #789
Depends-On: openstack-k8s-operators/openstack-operator#1697

update prometheus_collector config

openshift-ci · 2025-08-26T08:49:47Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: 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~~ [jlarriba]

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 · 2025-08-26T09:03:21Z

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

❌ openstack-k8s-operators-content-provider FAILURE in 7m 16s
⚠️ podified-multinode-edpm-deployment-crc SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
❌ telemetry-openstack-meta-content-provider-master FAILURE in 12m 04s
⚠️ telemetry-operator-multinode-default-telemetry SKIPPED Skipped due to failed job openstack-k8s-operators-content-provider
⚠️ functional-tests-osp18 SKIPPED Skipped due to failed job telemetry-openstack-meta-content-provider-master

api/v1beta1/telemetry_types.go

controllers/cloudkitty_controller.go

controllers/cloudkittyapi_controller.go

controllers/cloudkittyproc_controller.go

pkg/cloudkittyproc/statefulset.go

…et is not present

jlarriba · 2025-10-15T12:58:28Z

/test telemetry-operator-build-deploy-kuttl

templates/cloudkitty/config/cloudkitty.conf

softwarefactory-project-zuul · 2025-10-15T14:12:02Z

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/0ccdac86d40d425aa24e9713fb68354e

✔️ openstack-k8s-operators-content-provider SUCCESS in 59m 55s
❌ podified-multinode-edpm-deployment-crc FAILURE in 33m 14s
✔️ telemetry-openstack-meta-content-provider-master SUCCESS in 2h 22m 39s
❌ telemetry-operator-multinode-default-telemetry FAILURE in 35m 10s
✔️ functional-tests-osp18 SUCCESS in 2h 01m 33s

softwarefactory-project-zuul · 2025-10-21T09:41:45Z

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 47m 46s
❌ podified-multinode-edpm-deployment-crc FAILURE in 28m 16s
✔️ telemetry-openstack-meta-content-provider-master SUCCESS in 1h 04m 59s
❌ telemetry-operator-multinode-default-telemetry FAILURE in 28m 00s
❌ functional-tests-osp18 FAILURE in 33m 12s

jlarriba · 2025-10-21T09:49:22Z

/test telemetry-operator-build-deploy

jlarriba · 2025-10-21T09:49:36Z

recheck

softwarefactory-project-zuul · 2025-10-21T10:48:57Z

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/6527b827345c4c9ea3b0a5f14576104d

✔️ openstack-k8s-operators-content-provider SUCCESS in 58m 18s
❌ podified-multinode-edpm-deployment-crc FAILURE in 28m 16s
✔️ telemetry-openstack-meta-content-provider-master SUCCESS in 52m 42s
❌ telemetry-operator-multinode-default-telemetry FAILURE in 27m 05s
❌ functional-tests-osp18 FAILURE in 32m 09s

This gets CK in line with the rest of the openstack service containers. It makes sure CK is being run as the cloudkitty user instead of root.

Used to set the size in the LokiStack CR created by the operator. By default 1x.demo is used.

controllers/cloudkitty_controller.go

Co-authored-by: Jaromír Wysoglad <smulumas@gmail.com>

[OSPRH-21081] Lower privileges for CK related pods

Add lokiStackSize field to CK CRD

softwarefactory-project-zuul · 2025-10-29T12:08:02Z

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/3c0491305b584dac9ac2fce4e4a02855

✔️ openstack-k8s-operators-content-provider SUCCESS in 52m 06s
❌ podified-multinode-edpm-deployment-crc FAILURE in 28m 24s
✔️ telemetry-openstack-meta-content-provider-master SUCCESS in 58m 13s
❌ telemetry-operator-multinode-default-telemetry FAILURE in 27m 51s
❌ functional-tests-osp18 FAILURE in 33m 33s

softwarefactory-project-zuul · 2025-10-29T20:26:42Z

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/99dae7e0c1d54ee9807329dfc4b628f5

✔️ openstack-k8s-operators-content-provider SUCCESS in 46m 56s
❌ podified-multinode-edpm-deployment-crc FAILURE in 27m 56s
✔️ telemetry-openstack-meta-content-provider-master SUCCESS in 50m 52s
❌ telemetry-operator-multinode-default-telemetry FAILURE in 27m 05s
❌ functional-tests-osp18 FAILURE in 32m 21s

vyzigold · 2025-10-29T21:52:52Z

Seems like the LokiStackSize broke the interaction between O-O and T-O, which escaped me in my local testing. I'll provide a fix shortly.

elfiesmelfie · 2025-11-20T13:15:02Z

/cherry-pick 18.0-fr4

openshift-cherrypick-robot · 2025-11-20T13:15:40Z

@elfiesmelfie: #741 failed to apply on top of branch "18.0-fr4":

Applying: Cloudkitty deployment
Using index info to reconstruct a base tree...
M	api/bases/telemetry.openstack.org_autoscalings.yaml
M	api/bases/telemetry.openstack.org_ceilometers.yaml
M	api/bases/telemetry.openstack.org_telemetries.yaml
M	config/crd/bases/telemetry.openstack.org_autoscalings.yaml
M	config/crd/bases/telemetry.openstack.org_ceilometers.yaml
M	config/crd/bases/telemetry.openstack.org_telemetries.yaml
M	config/crd/kustomization.yaml
M	config/rbac/role.yaml
M	controllers/telemetry_controller.go
M	main.go
Falling back to patching base and 3-way merge...
Auto-merging main.go
Auto-merging controllers/telemetry_controller.go
Auto-merging config/rbac/role.yaml
CONFLICT (content): Merge conflict in config/rbac/role.yaml
Auto-merging config/crd/kustomization.yaml
CONFLICT (content): Merge conflict in config/crd/kustomization.yaml
Auto-merging config/crd/bases/telemetry.openstack.org_telemetries.yaml
Auto-merging config/crd/bases/telemetry.openstack.org_ceilometers.yaml
Auto-merging config/crd/bases/telemetry.openstack.org_autoscalings.yaml
Auto-merging api/bases/telemetry.openstack.org_telemetries.yaml
Auto-merging api/bases/telemetry.openstack.org_ceilometers.yaml
Auto-merging api/bases/telemetry.openstack.org_autoscalings.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 Cloudkitty deployment

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.

jlarriba and others added 8 commits June 30, 2025 13:35

Cloudkitty deployment

a25975a

Merge branch 'main' into cloudkitty_separate

c223c8b

CloudKitty TLS

294361a

update prometheus_collector

d803db4

Merge pull request #2 from mgirgisf/cloudkitty-prom-collector

f91b1b8

update prometheus_collector config

Make it compatible with previous oscp

6081ab1

From mgirgis: Add Cloudkitty healthcheck.py

1f89106

Remove /v2 from path in cloudkitty, as the CLI automatically adds it

13ef450

openshift-ci bot requested review from elfiesmelfie and vyzigold August 26, 2025 08:49

openshift-ci bot added the approved label Aug 26, 2025

jlarriba requested a review from mgirgisf August 26, 2025 08:50

jlarriba force-pushed the cloudkitty_separate branch 3 times, most recently from 49c4872 to d214cf8 Compare August 26, 2025 10:17

Fix pre-commit

73afff2

jlarriba force-pushed the cloudkitty_separate branch from d214cf8 to 73afff2 Compare August 26, 2025 10:22

jlarriba changed the title ~~Add CloudKitty deployment to telemetry-operator~~ [DNM] Add CloudKitty deployment to telemetry-operator Aug 27, 2025

elfiesmelfie mentioned this pull request Aug 27, 2025

[zuul] Add a CloudKitty CI job #720

Merged

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

vyzigold reviewed Sep 10, 2025

View reviewed changes

api/v1beta1/telemetry_types.go Show resolved Hide resolved

vyzigold reviewed Sep 11, 2025

View reviewed changes

controllers/cloudkitty_controller.go Show resolved Hide resolved

vyzigold reviewed Sep 11, 2025

View reviewed changes

controllers/cloudkitty_controller.go Outdated Show resolved Hide resolved

vyzigold reviewed Sep 11, 2025

View reviewed changes

controllers/cloudkittyapi_controller.go Show resolved Hide resolved

vyzigold reviewed Sep 11, 2025

View reviewed changes

controllers/cloudkittyapi_controller.go Show resolved Hide resolved

vyzigold reviewed Sep 11, 2025

View reviewed changes

controllers/cloudkittyproc_controller.go Outdated Show resolved Hide resolved

vyzigold reviewed Sep 15, 2025

View reviewed changes

pkg/cloudkittyproc/statefulset.go Outdated Show resolved Hide resolved

vyzigold mentioned this pull request Sep 15, 2025

[DNM] Create LokiStack for CloudKitty #751

Closed

Do not allow for CloudKitty deployment if the PrometheusEndpoint secr…

168abfe

…et is not present

vyzigold reviewed Oct 15, 2025

View reviewed changes

templates/cloudkitty/config/cloudkitty.conf Outdated Show resolved Hide resolved

Allow for configuration of the period CloudKitty config option

ce96df1

jlarriba force-pushed the cloudkitty_separate branch from fe11865 to 2981332 Compare October 21, 2025 16:13

Removed unused storage_influxdb section, as we only support Loki storage

dc42c6c

jlarriba force-pushed the cloudkitty_separate branch from 2981332 to dc42c6c Compare October 21, 2025 19:11

vyzigold added 2 commits October 23, 2025 04:50

[OSPRH-21081] Lower privileges for CK related pods

515eab1

This gets CK in line with the rest of the openstack service containers. It makes sure CK is being run as the cloudkitty user instead of root.

Add lokiStackSize field to CK CRD

8f3eb14

Used to set the size in the LokiStack CR created by the operator. By default 1x.demo is used.

ayefimov-1 mentioned this pull request Oct 27, 2025

Add Cloudkitty CI Job #777

Closed

vyzigold reviewed Oct 27, 2025

View reviewed changes

controllers/cloudkitty_controller.go Outdated Show resolved Hide resolved

jlarriba force-pushed the cloudkitty_separate branch from bd6a045 to dc42c6c Compare October 29, 2025 09:26

jlarriba and others added 3 commits October 29, 2025 10:27

Reconcile every 5 seconds, not 5 nanoseconds

55fc7f4

Co-authored-by: Jaromír Wysoglad <smulumas@gmail.com>

Merge pull request #10 from vyzigold/ck_lowest_privileges

6e04e04

[OSPRH-21081] Lower privileges for CK related pods

Merge pull request #11 from vyzigold/add-LokiStackSize

e38757b

Add lokiStackSize field to CK CRD

Merge branch 'main' into cloudkitty_separate

4dd28e2

Allow lokiStackSize value to be empty string

f2f0854

elfiesmelfie added the lgtm label Nov 19, 2025

openshift-merge-bot bot merged commit 6b0e5ca into openstack-k8s-operators:main Nov 19, 2025
6 checks passed

openstack-k8s-operators deleted a comment from openshift-cherrypick-robot Nov 20, 2025

Add CloudKitty deployment to telemetry-operator #741

Add CloudKitty deployment to telemetry-operator #741

Uh oh!

Conversation

jlarriba commented Aug 26, 2025 • edited by elfiesmelfie Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Aug 26, 2025

Uh oh!

softwarefactory-project-zuul bot commented Aug 26, 2025

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jlarriba commented Oct 15, 2025

Uh oh!

Uh oh!

softwarefactory-project-zuul bot commented Oct 15, 2025

Uh oh!

softwarefactory-project-zuul bot commented Oct 21, 2025

Uh oh!

jlarriba commented Oct 21, 2025

Uh oh!

jlarriba commented Oct 21, 2025

Uh oh!

softwarefactory-project-zuul bot commented Oct 21, 2025

Uh oh!

Uh oh!

softwarefactory-project-zuul bot commented Oct 29, 2025

Uh oh!

softwarefactory-project-zuul bot commented Oct 29, 2025

Uh oh!

vyzigold commented Oct 29, 2025

Uh oh!

Uh oh!

elfiesmelfie commented Nov 20, 2025

Uh oh!

openshift-cherrypick-robot commented Nov 20, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

jlarriba commented Aug 26, 2025 •

edited by elfiesmelfie

Loading