Remove epoxy and support s2i containers by amoralej · Pull Request #437 · openstack-k8s-operators/watcher-operator

amoralej · 2026-08-18T09:11:59Z

It's adding a new variable RELATED_IMAGE_WATCHER_BASE_IMAGE_URL_DEFAULT for the new s2i unified image and setting it for kuttl job.

It's also removing epoxy job from main branch.

This patch is removing the epoxy jobs as the main branch is intended to support only deployments from recent branches (goal is hibiscus). Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

This patch is introducing a new defaulting variable RELATED_IMAGE_WATCHER_BASE_URL_DEFAULT which, when used, defines the default container image for the three watcher service. Otherwise the pre-existing logic is maintained. Default value is empty so that the default behavior will be changed later. I'm setting kuttl jobs to use new S2I container. Switch for master deployment job will be done as follow up. Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

Watcher is moving to a single container image to all the services. This patch is modifying the defaulting logic and environment variable used to set the default images in OpenStackVersion for the Watcher services. Depends-On: openstack-k8s-operators/watcher-operator#437 Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

coderabbitai · 2026-08-19T10:31:23Z

Important

🔍 Trigger review

This repository does not receive automatic reviews because it has fewer than 10 stars.

⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: 2d7c4255-9d6b-44f8-b54e-85241bbf92df

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands.}

centosinfra-prod-github-app · 2026-08-19T10:31:30Z

Zuul encountered a syntax error while parsing its
configuration in the repo openstack-k8s-operators/watcher-operator on branch main. The
problem was:

The key "cifmw_test_operator_tempest_image_tag" appears more than once; duplicate keys are not permitted.

cifmw_repo_setup_branch: master
# To consume containers from meta content provider
cifmw_update_containers_openstack: true
cifmw_update_containers_org: podified-master-centos10
fetch_dlrn_hash: false
cifmw_update_containers_watcher: true
watcher_services_tag: watcher_latest
watcher_registry_url: "{{ content_provider_os_registry_url }}"
cifmw_test_operator_tempest_image_tag: master-latest
...

in "openstack-k8s-operators/watcher-operator/.zuul.yaml@main", line 184

centosinfra-prod-github-app · 2026-08-19T14:20:04Z

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://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/b2beaf7fdbaf4753940d0193f3bb2bad

✔️ openstack-meta-content-provider-master SUCCESS in 3h 29m 28s
❌ watcher-operator-validation-master FAILURE in 2h 22m 45s
✔️ noop SUCCESS in 0s
✔️ watcher-operator-kuttl SUCCESS in 1h 00m 23s

SeanMooney · 2026-08-19T20:18:57Z

    name: opendev-master-watcher-operator-pipeline
    github-check:
      jobs:
        - openstack-meta-content-provider-master


so this shoudl get replaced wit the stadnard content provder
and we shoudl add the newo s2i content provder as well in a follow up

before we do that we will need to update the kuttl jobs to use the new content provdier and the related images as well .

Note the kuttl jobs is already using the s2i as it just uses the default from the operator.

oh good point it is but its not using the images build by the content proivder

i actully think that was true before however so that out of scope for now.
i dont think we currently render openstack-versions in the cluster it uses in the ci job to repoitn it but using them for quay.io for now is more then good enouch

we are testing the operator not the the service in kuttle primarally

Exactly, that was the reason to use that when we initially created the kuttl test.

centosinfra-prod-github-app · 2026-08-19T21:27:16Z

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://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/4e9c4a0e0a354eceacae509c1cb9396f

✔️ openstack-meta-content-provider-master SUCCESS in 1h 43m 00s
❌ watcher-operator-validation-master NODE_FAILURE Node(set) request 099-0000175460 failed in 0s
✔️ noop SUCCESS in 0s
❌ watcher-operator-kuttl RETRY_LIMIT in 46m 31s

amoralej · 2026-08-19T21:28:35Z

check-rdo

centosinfra-prod-github-app · 2026-08-19T23:12:32Z

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://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/zuul/t/rdoproject.org/buildset/0acfe058519d4360b6e4aa33d5adc4f8

✔️ openstack-meta-content-provider-master SUCCESS in 1h 42m 13s
❌ watcher-operator-validation-master FAILURE in 53m 16s
✔️ noop SUCCESS in 0s
✔️ watcher-operator-kuttl SUCCESS in 53m 55s

This patch is moving to deploy watcher using the s2i containers from upstream openstack-k8s-operators project. Also the tempest container from s2i is used. For the rest of containers it still uses the containers coming from the provider job. We need to update the openstackversion as the last post_deploy action or the openstackversion is reverted to the previous value at a later stage. We will be able to do this better once we have proper support for s2i in the ci tooling. Co-Authored-By: Chandan Kumar (raukadah) <raukadah@gmail.com> Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

amoralej · 2026-08-20T07:42:19Z

/test functional

amoralej · 2026-08-20T11:28:24Z

CI job used the s2i images for watcher, see https://gateway-cloud-softwarefactory.apps.ocp.cloud.ci.centos.org/logs//44d/rdoproject.org/44db94215a3b408bbac992fbbdf69e37/controller/ci-framework-data/logs/openstack-must-gather/quay-io-openstack-k8s-operators-openstack-must-gather-sha256-e951c596b1c06e42cc41260bfe9b929fa850a06bae1d25cda4a1289fdbebaf5b/namespaces/openstack/crs/watchers.watcher.openstack.org/watcher.yaml

We could make this better without post_deployment hooks once openstack-k8s-operators/ci-framework#4099 is merged or once everything is moved to s2i.

viroel

Looks good, we can improve later once we get some updates working in ci-framework

viroel · 2026-08-20T12:51:03Z

        chdir: "{{ watcher_repo }}"
        script: make stop_watcher_integrated
    - name: Install Watcher Operator in standalone mode
      vars:


Are these vars still needed?

We'll need to redo all that code once we have new provider jobs able to rebuild the s2i service operators on the fly which is WIP. Until that exist, this will be unused code, but i think it's good to keep as trace or the kind of operations we need to do.

openshift-ci · 2026-08-20T17:48:58Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by:

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

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

amoralej added 2 commits August 18, 2026 10:23

Remove epoxy based jobs

823eb2d

This patch is removing the epoxy jobs as the main branch is intended to support only deployments from recent branches (goal is hibiscus). Signed-off-by: Alfredo Moralejo <amoralej@redhat.com>

openshift-ci Bot requested review from dprince and viroel August 18, 2026 09:12

amoralej added the do-not-merge/hold label Aug 18, 2026

amoralej mentioned this pull request Aug 18, 2026

Move watcher to s2i container images openstack-k8s-operators/openstack-operator#2038

Open

amoralej force-pushed the support-s2i branch from 7ed7439 to c94674b Compare August 19, 2026 10:34

amoralej force-pushed the support-s2i branch from c94674b to cf1570b Compare August 19, 2026 19:29

SeanMooney reviewed Aug 19, 2026

View reviewed changes

Comment thread api/v1beta1/common_types.go

SeanMooney reviewed Aug 19, 2026

View reviewed changes

amoralej force-pushed the support-s2i branch from cf1570b to 2f60dc2 Compare August 20, 2026 07:28

SeanMooney approved these changes Aug 20, 2026

View reviewed changes

openshift-ci Bot assigned SeanMooney Aug 20, 2026

openshift-ci Bot added the lgtm label Aug 20, 2026

amoralej removed the do-not-merge/hold label Aug 20, 2026

viroel reviewed Aug 20, 2026

View reviewed changes

viroel approved these changes Aug 20, 2026

View reviewed changes

openshift-ci Bot assigned viroel Aug 20, 2026

viroel added the approved label Aug 20, 2026

openshift-merge-bot Bot merged commit 5715956 into openstack-k8s-operators:main Aug 20, 2026
8 checks passed

Uh oh!

Conversation

amoralej commented Aug 18, 2026

Uh oh!

coderabbitai Bot commented Aug 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

centosinfra-prod-github-app Bot commented Aug 19, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 19, 2026

Uh oh!

Uh oh!

Uh oh!

Uh oh!

SeanMooney Aug 19, 2026

Choose a reason for hiding this comment

Uh oh!

amoralej Aug 20, 2026

Choose a reason for hiding this comment

Uh oh!

SeanMooney Aug 20, 2026

Choose a reason for hiding this comment

Uh oh!

amoralej Aug 20, 2026

Choose a reason for hiding this comment

Uh oh!

centosinfra-prod-github-app Bot commented Aug 19, 2026

Uh oh!

amoralej commented Aug 19, 2026

Uh oh!

centosinfra-prod-github-app Bot commented Aug 19, 2026

Uh oh!

amoralej commented Aug 20, 2026

Uh oh!

amoralej commented Aug 20, 2026

Uh oh!

viroel left a comment

Choose a reason for hiding this comment

Uh oh!

viroel Aug 20, 2026

Choose a reason for hiding this comment

Uh oh!

amoralej Aug 21, 2026

Choose a reason for hiding this comment

Uh oh!

openshift-ci Bot commented Aug 20, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

coderabbitai Bot commented Aug 19, 2026 •

edited

Loading