Skip to content

[ci] Extend the kustomizations in logging to include autoscaling#698

Merged
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
elfiesmelfie:ci/combine-autoscaling-logging
Jun 20, 2025
Merged

[ci] Extend the kustomizations in logging to include autoscaling#698
openshift-merge-bot[bot] merged 1 commit intoopenstack-k8s-operators:mainfrom
elfiesmelfie:ci/combine-autoscaling-logging

Conversation

@elfiesmelfie
Copy link
Copy Markdown
Contributor

@elfiesmelfie elfiesmelfie commented Jun 6, 2025

The cifmw_edpm_prepare_kustomizations var defined in vars-autoscaling gets replaced by the one in logging. This means that autoscaling doesn't get enabled when both are deployed together.
For now, I have copied the various kustomizations into the same var in the logging file.
Going forward, this should be updated to copy the kustomizations into the artifacts/manifests/kustomizations/controlplane dir in separate hooks, so that they can be enabled/disabled independantly.

This is related to infrawatch/feature-verification-tests#273

Depends-On: openstack-k8s-operators/ci-framework#3063

Depends-On: #700

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 6, 2025

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@softwarefactory-project-zuul
Copy link
Copy Markdown

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/042d960c21a84c91acc94128427bb99c

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 06m 50s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 16m 38s
✔️ telemetry-operator-multinode-default-telemetry SUCCESS in 1h 00m 05s
functional-graphing-tests-osp18 FAILURE in 1h 14m 14s (non-voting)
✔️ functional-autoscaling-tests-osp18 SUCCESS in 1h 47m 30s
functional-logging-tests-osp18 FAILURE in 1h 04m 17s

@softwarefactory-project-zuul
Copy link
Copy Markdown

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/28cc86da59b242c5936f9a5507c11ac4

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 06m 12s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 33s
✔️ telemetry-operator-multinode-default-telemetry SUCCESS in 1h 17m 11s
functional-graphing-tests-osp18 FAILURE in 1h 14m 22s (non-voting)
✔️ functional-autoscaling-tests-osp18 SUCCESS in 1h 47m 59s
functional-logging-tests-osp18 FAILURE in 1h 03m 54s

@softwarefactory-project-zuul
Copy link
Copy Markdown

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/9775b64aa6104ba385f4468b3f65e30f

✔️ openstack-k8s-operators-content-provider SUCCESS in 3h 33m 43s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 14m 31s
telemetry-operator-multinode-default-telemetry FAILURE in 1h 15m 49s
functional-graphing-tests-osp18 FAILURE in 1h 14m 25s (non-voting)
functional-autoscaling-tests-osp18 TIMED_OUT in 3h 12m 47s
✔️ functional-logging-tests-osp18 SUCCESS in 1h 15m 45s

@softwarefactory-project-zuul
Copy link
Copy Markdown

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/5a26ce276d9e4ee98140ffa1969fdeff

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 35m 33s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 49s
telemetry-operator-multinode-default-telemetry FAILURE in 1h 13m 22s
functional-graphing-tests-osp18 FAILURE in 22m 48s (non-voting)
functional-autoscaling-tests-osp18 FAILURE in 22m 43s
✔️ functional-logging-tests-osp18 SUCCESS in 1h 13m 59s

@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch from b6a3637 to 3b8b9e8 Compare June 11, 2025 17:12
@softwarefactory-project-zuul
Copy link
Copy Markdown

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/8835779a32804aff91c755133eedfb63

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 37m 03s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 15m 00s
telemetry-operator-multinode-default-telemetry FAILURE in 1h 17m 43s
functional-graphing-tests-osp18 FAILURE in 22m 53s (non-voting)
functional-autoscaling-tests-osp18 FAILURE in 23m 04s
✔️ functional-logging-tests-osp18 SUCCESS in 1h 11m 34s

@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch from 3b8b9e8 to cc08eb9 Compare June 12, 2025 16:20
@softwarefactory-project-zuul
Copy link
Copy Markdown

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 2h 02m 31s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 1h 11m 10s
telemetry-operator-multinode-default-telemetry FAILURE in 1h 17m 24s
functional-graphing-tests-osp18 FAILURE in 1h 15m 05s (non-voting)
✔️ functional-autoscaling-tests-osp18 SUCCESS in 1h 42m 22s
✔️ functional-logging-tests-osp18 SUCCESS in 1h 07m 52s

@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch from cc08eb9 to 8cebceb Compare June 12, 2025 19:06
Copy link
Copy Markdown
Contributor

@vyzigold vyzigold left a comment

Choose a reason for hiding this comment

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

As written in the PR description, I also think we should be creating the kustomization files, so this is going in the right direction, we just need to fix the issue with default-telemetry.

- name: Import tasks for creating COO subscription
ansible.builtin.include_tasks: "create-coo-subscription.yaml"

- name: Copy controlplane kustomization
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

This destroys the default-telemetry scenario, which relies on enabling / disabling parts of telemetry on its own as it goes

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Also it'd be good to rename the file if it's doing more than just creating the COO sub.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I see I'm incorrect, the default-telemetry works, because it actually doesn't check the environment it starts with. But I still think we shouldn't apply the kustomization for that job. One of the first steps in default-telemetry are:

  1. Start without autoscaling and metricstorage enabled
  2. Check that telemetry-operator works
  3. Enable autoscaling and metricstorage
  4. Check that everything went smooth and no errors are logged in telemetry-operator.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I'll have a closer look at this, but I think it might be fixed with #700, which replaces the playbook with a var that triggers the installation in cifmw

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I left a comment on #700 . I think once that merges, then we could merge this one as well.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I've rebased this branch against #700, so I don't have to do it later if my latest changes work and #700 merges shortly.

@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch from 8cebceb to b910c0d Compare June 17, 2025 16:03
@softwarefactory-project-zuul
Copy link
Copy Markdown

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

✔️ openstack-k8s-operators-content-provider SUCCESS in 1h 20m 55s
✔️ podified-multinode-edpm-deployment-crc SUCCESS in 57m 33s
✔️ telemetry-operator-multinode-default-telemetry SUCCESS in 1h 00m 33s
functional-graphing-tests-osp18 FAILURE in 24m 39s (non-voting)
functional-autoscaling-tests-osp18 FAILURE in 23m 58s
✔️ functional-logging-tests-osp18 SUCCESS in 1h 03m 31s

@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch 2 times, most recently from ba682bb to 707637a Compare June 18, 2025 12:15
@elfiesmelfie elfiesmelfie marked this pull request as ready for review June 18, 2025 13:53
@openshift-ci openshift-ci Bot requested review from abays and lewisdenny June 18, 2025 13:53
The cifmw_edpm_prepare_kustomizations var defined in vars-autoscaling
gets replaced by the one in logging. This means that autoscaling doesn't
get enabled.

This change moves the kustomzations into files that get applied during
deployment. This is the same method that is used by the loggin dataplane
configuration.

* The logging and autoscaling kustomizations have been moved into the
  pre_deploy hooks, which copy the kustomizations to the appropriate
  file location.
* The autoscaling kustomization is done in a newly-defined hook.
* The dashboard dashboard enablement kustomization is separated out of the autoscaling
@elfiesmelfie elfiesmelfie force-pushed the ci/combine-autoscaling-logging branch from 707637a to 4ba8301 Compare June 18, 2025 14:44
@elfiesmelfie
Copy link
Copy Markdown
Contributor Author

/test telemetry-operator-build-deploy

@elfiesmelfie
Copy link
Copy Markdown
Contributor Author

/test telemetry-operator-build-deploy-kuttl

@elfiesmelfie elfiesmelfie requested a review from vyzigold June 18, 2025 16:54
@elfiesmelfie
Copy link
Copy Markdown
Contributor Author

recheck

@vyzigold
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Jun 20, 2025
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Jun 20, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: elfiesmelfie, vyzigold

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 [elfiesmelfie,vyzigold]

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

@openshift-merge-bot openshift-merge-bot Bot merged commit 3ba8662 into openstack-k8s-operators:main Jun 20, 2025
6 checks passed
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.

2 participants