Skip to content

Conversation

@ayefimov-1
Copy link
Contributor

@ayefimov-1 ayefimov-1 commented Oct 27, 2025

Create a new Zuul CI Job that will run Cloudkitty tempest tests.

Last change in CK
Depends-On: https://review.opendev.org/c/openstack/cloudkitty/+/961609

Depends-On: openstack-k8s-operators/install_yamls#1088

merged: openstack-k8s-operators/tcib#328

Add cloudkitty-tempest package to openstack-tempest-all (Requires using tempest master image)
https://review.rdoproject.org/r/c/openstack/tempest-distgit/+/58015

merged: Related change: openstack-k8s-operators/test-operator#340

telemetry-operator change: #741

openstack-operator change: (Merge Conflicts)
Depends-On: openstack-k8s-operators/openstack-operator#1614

The openstack-operator is getting updated to reference the wrong version of telemetry-operator, which doesn't have CK available. This cifmw change will hopefully fix it. This is only an issue because we're using Depends-On to add a dependency on multiple changes from the same operator repo (i.e. telemetry-operator)

Add CK to patch-openstack-versions
Depends-On: infrawatch/feature-verification-tests#315

openstack-k8s-operators/ci-framework#3400

jlarriba and others added 30 commits June 30, 2025 13:35
When the secret is unset, cloudkitty will not start, since there was no
default set.

The osp-secret is used as the default secret for other services.

Thes default value for the cloudkitty secret is updated to match the
other service defaults, since the required information (CK password)
is expected to be in the same secret as the other services.
Also add mTLS certificates deployment needed for communication
between Loki and CloudKitty. All is tested with kuttl-tests,
some minor fixes across CloudKitty related code included
(other needed fixes were discussed and will follow in the future).

EnsureWatches was moved from metricstorage_controller into
pkg/utils. All calls to this function throughout the whole metric
storage controller needed to be modified to point to the new
location, but other than that there aren't any changes to the
metric storage controller.
The s3StorageConfig.secret is passed to Lokistack, which requires
some value be set.
The default is needed, or else there will be an error when it is not
configured.

The default is set to a reasonable value for the secret name
(cloudkitty-loki-s3) and the type (s3), which match the values we're
planning on using for the CI environment.

Lines added: 1
Lines generated: 16
The healthcheck for cloudkitty-proc/probe was failing because the CA
was not trusted. The TLS-related file were not available in the expected
location in the container.

The kolla_set_config command is used so that the mounted config files
get copied into the expected location for the healthcheck.

The command was updated to use 'bash -c' so that both the kolla_set_config
and the healthcheck command would be run on startup.

[API] Update script used in uwsgi template

The script location changed between antelope and master containers.
In both cases, it exists in the same alternative location

Update initial delay on liveness and readiness probes
This give a chance for the api to start up before the first healthcheck

[API] Add metrics.yaml into the api pod
…_default_secret

[CloudKitty] Add osp-secret as the default for secret
…_loki

[cloudkitty] Add LokiStack deployment
When the secret is unset, cloudkitty will not start, since there was no
default set.

The osp-secret is used as the default secret for other services.

Thes default value for the cloudkitty secret is updated to match the
other service defaults, since the required information (CK password)
is expected to be in the same secret as the other services.
Also add mTLS certificates deployment needed for communication
between Loki and CloudKitty. All is tested with kuttl-tests,
some minor fixes across CloudKitty related code included
(other needed fixes were discussed and will follow in the future).

EnsureWatches was moved from metricstorage_controller into
pkg/utils. All calls to this function throughout the whole metric
storage controller needed to be modified to point to the new
location, but other than that there aren't any changes to the
metric storage controller.
The s3StorageConfig.secret is passed to Lokistack, which requires
some value be set.
The default is needed, or else there will be an error when it is not
configured.

The default is set to a reasonable value for the secret name
(cloudkitty-loki-s3) and the type (s3), which match the values we're
planning on using for the CI environment.

Lines added: 1
Lines generated: 16
elfiesmelfie and others added 17 commits October 14, 2025 06:48
TODO: update the deploy_logging_dependencies role
When running in CI, with a differently named CR, the defaults are not set for Telemetry
   - 'The Telemetry "telemetry-ck" is invalid: '
   - '* spec.autoscaling.aodh.apiImage: Required value'
   - '* spec.autoscaling.aodh.evaluatorImage: Required value'
   - '* spec.autoscaling.aodh.listenerImage: Required value'
   - '* spec.autoscaling.aodh.notifierImage: Required value'
   - '* spec.ceilometer.centralImage: Required value'
   - '* spec.ceilometer.computeImage: Required value'
   - '* spec.ceilometer.ipmiImage: Required value'
   - '* spec.ceilometer.notificationImage: Required value'
   - '* spec.ceilometer.proxyImage: Required value'
   - '* spec.ceilometer.sgCoreImage: Required value'
WORKAROUND: telemetry-with-cloudkitty is updated to explicitly add these values
Loki-operator needs to be pinned to 6.3.0, because 6.3.1 has this
issue: https://issues.redhat.com/browse/LOG-7752
Try alternative way to get installplan

Add retries to installplan check
If there's no value returned, the rc is still 0, so we need to explicitly state the success criteria
Add kustomization for oscp to enable CK pre-deploy

Move loki installation to pre_deploy.
Set the storageClass to crc-csi-hostpath-provisioner for CloudKitty
deployment in CRC-based CI jobs. This prevents the need to increase
PVC allocations in install_yamls by using the default storage class
available in CRC, which allocates storage as required.
@openshift-ci openshift-ci bot requested review from elfiesmelfie and viroel October 27, 2025 18:22
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: ayefimov-1
Once this PR has been reviewed and has the lgtm label, please assign abays for approval. For more information see the Code Review Process.

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

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 27, 2025

Hi @ayefimov-1. Thanks for your PR.

I'm waiting for a github.com member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

@softwarefactory-project-zuul
Copy link

kind: Subscription
metadata:
name: observability-operator
# name: observability-operator # removed per Juan
Copy link
Contributor

Choose a reason for hiding this comment

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

I'm pretty sure this won't work, since name is actually required field.

@jlarriba
Copy link
Collaborator

/ok-to-test

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 28, 2025

@ayefimov-1: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/precommit-check 46ea0df link true /test precommit-check
ci/prow/telemetry-operator-build-deploy-kuttl 46ea0df link true /test telemetry-operator-build-deploy-kuttl

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot
Copy link
Contributor

PR needs rebase.

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.

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.

7 participants