Skip to content

Add ck-build-containers target to build unmerged CloudKitty changes #749

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.

Sign up for GitHub

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Add ck-build-containers target to build unmerged CloudKitty changes #749

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c2403e
Add ck-build-containers target to build unmerged CloudKitty changes
elfiesmelfie Sep 9, 2025
ad01de1
Remove cloudkitty before pip installing
vyzigold Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,3 +417,8 @@ PHONY: crd-schema-check
crd-schema-check: manifests
INSTALL_DIR=$(LOCALBIN) CRD_SCHEMA_CHECKER_VERSION=$(CRD_SCHEMA_CHECKER_VERSION) hack/build-crd-schema-checker.sh
INSTALL_DIR=$(LOCALBIN) BASE_REF="$${PULL_BASE_SHA:-$(BRANCH)}" hack/crd-schema-checker.sh

.PHONY: ck-build-containers
ck-build-containers:
podman build -f ci/cloudkitty-api.containerfile -t $(CK_IMAGE_REGISTRY)cloudkitty-api --build-arg CK_BRANCH=$(CK_BRANCH)
podman build -f ci/cloudkitty-proc.containerfile -t $(CK_IMAGE_REGISTRY)cloudkitty-processor --build-arg CK_BRANCH=$(CK_BRANCH)
25 changes: 25 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,31 @@ If you need to connect directly to the CRC VM just use
ssh -i ~/.crc/machines/crc/id_ecdsa core@"192.168.130.11"
```

## Building CloudKitty images with WIP code

If you want to test a version of Cloudkitty that is not yet merged, you can build the containers locally and push them to some image registry (e.g. an account on quay.io)

```bash
export CK_BRANCH=<some branch> # e.g. refs/changes/68/950868/9

make ck-build-containers
```

Tag and push the container to your registry

```bash
podman push cloudkitty-api <image-registry>
podman push cloudkitty-processor <image-registry>
```

To use the new images, edit the telemetry or cloudkitty CR to set the image URLs

```
oc patch telemetry telemetry --type='json' -p='[{"op": "replace", "path": "/spec/cloudkitty/cloudKittyAPI/containerImage", "value": <CK_API_IMAGE>}]'
oc patch telemetry telemetry --type='json' -p='[{"op": "replace", "path": "/spec/cloudkitty/cloudKittyProc/containerImage", "value": <CK_PROC_IMAGE>}]'

```

## License

```text
Expand Down
8 changes: 8 additions & 0 deletions ci/cloudkitty-api.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-api:current-tested

ARG CK_REPO="git+https://review.opendev.org/openstack/cloudkitty"
ARG CK_BRANCH=master

RUN rm -rf /usr/lib/python3.12/site-packages/cloudkitty
RUN python3 -m ensurepip && python3 -m pip install --prefix=/usr $CK_REPO@$CK_BRANCH

9 changes: 9 additions & 0 deletions ci/cloudkitty-proc.containerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
FROM quay.rdoproject.org/podified-master-centos10/openstack-cloudkitty-processor:current-tested

ARG CK_REPO="git+https://review.opendev.org/openstack/cloudkitty"
ARG CK_BRANCH=master

USER root
RUN rm -rf /usr/lib/python3.12/site-packages/cloudkitty
RUN python3 -m ensurepip && python3 -m pip install --prefix=/usr $CK_REPO@$CK_BRANCH
USER cloudkitty