Skip to content

Add infra container images for memcached, redis, rabbitmq and mariadb - #13

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
lmiccini:add-infra-containers
Aug 19, 2026
Merged

Add infra container images for memcached, redis, rabbitmq and mariadb#13
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:mainfrom
lmiccini:add-infra-containers

Conversation

@lmiccini

@lmiccini lmiccini commented Aug 7, 2026

Copy link
Copy Markdown
Contributor

Port container definitions from tcib for infrastructure services that don't require Python source builds. These are RPM-only containers built on top of openstack-base.

  • memcached: simple memcached service
  • redis: uses valkey (Redis-compatible fork) with procps-ng
  • rabbitmq: installs from CentOS Messaging SIG repo directly (the centos-release-rabbitmq-4 package requires centos-release which is unavailable on UBI), includes kolla extend_start bootstrap script
  • mariadb: full Galera cluster support with mariadb-server-galera, includes kolla extend_start and security_reset.expect scripts

Also updates build.sh to handle infrastructure containers (projects without sources.txt) by skipping source cloning and constraints.

Comment thread containers/base/rpms.repo Outdated
Comment thread build.sh Outdated
@lmiccini
lmiccini force-pushed the add-infra-containers branch from a729356 to b0c9ccd Compare August 7, 2026 15:43
@fmount
fmount self-requested a review August 7, 2026 15:57

@amoralej amoralej left a comment

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.

Please, rebase and include the rpms.in.yaml files created by update-sources for your projects. Also, note my comments about repos. Thanks!

Comment thread containers/base/rpms.repo Outdated
Comment thread containers/mariadb/mariadb/Containerfile Outdated
@lmiccini
lmiccini force-pushed the add-infra-containers branch from 213a7aa to 04bf979 Compare August 11, 2026 14:37
@centosinfra-prod-github-app

Copy link
Copy Markdown

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/s2i-openstack-containers for 13,04bf9792cb895fc5d6931c845f16b19141875b81

@centosinfra-prod-github-app

Copy link
Copy Markdown

Merge Failed.

This change or one of its cross-repo dependencies was unable to be automatically merged with the current state of its repository. Please rebase the change and upload a new patchset.
Warning:
Error merging github.com/openstack-k8s-operators/s2i-openstack-containers for 13,979f55e3a4ff1b7aa498cac9cdc38069c88ca4bb

@lmiccini
lmiccini force-pushed the add-infra-containers branch from 979f55e to e717ae3 Compare August 11, 2026 14:50
@amoralej

Copy link
Copy Markdown
Contributor

I've implemented pure-rpm case in #71 . Note that I'm keeping the build base in project dir instead of image dir for consistency with other service images, i expect it may help to import the content in other build envieronments (as konflux). That will force to update your COPY commands. I'd appreciate if you rebase on that one.

@amoralej amoralej left a comment

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.

Please rebase when ready to be merged. See my comments inline. Thanks!

Comment thread containers/mariadb/mariadb/Containerfile Outdated
Comment thread containers/memcached/memcached/Containerfile Outdated
Comment thread containers/rabbitmq/rabbitmq/Containerfile Outdated
Comment thread containers/redis/redis/Containerfile Outdated
Comment thread build.sh Outdated
@lmiccini
lmiccini force-pushed the add-infra-containers branch from e717ae3 to dbd5466 Compare August 19, 2026 13:45
@coderabbitai

coderabbitai Bot commented Aug 19, 2026

Copy link
Copy Markdown

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: 787170b7-edab-4c9c-bd21-65aecd9d2ffd


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.

@lmiccini
lmiccini force-pushed the add-infra-containers branch from dbd5466 to 9908fd5 Compare August 19, 2026 14:22
Port container definitions from tcib for infrastructure services that
don't require Python source builds. These are RPM-only containers built
on top of openstack-base, following the pure-RPM image convention (build
context is the project directory, no sources.txt).

- memcached: simple memcached service
- redis: uses valkey (Redis-compatible fork) with procps-ng
- rabbitmq: installs from CentOS Messaging SIG repo directly (the
  centos-release-rabbitmq-4 package requires centos-release which is
  unavailable on UBI)
- mariadb: full Galera cluster support with mariadb-server-galera

The operators (infra-operator, mariadb-operator) handle all service
bootstrapping externally via init containers and ConfigMap-mounted
scripts, so no kolla bootstrap logic is included; the Containerfiles
just set CMD for the service binary.

In the base image rpms.repo, replace the DLRN rabbitmq repo with the
CentOS Stream Messaging SIG RabbitMQ 4 repo.

Also adds rpms.in.yaml files for the mariadb, memcached, redis and
rabbitmq projects, and refreshes the base buildrequirements lockfile
(vcs-versioning 2.3.0 -> 2.3.1) so the reproducibility check passes now
that the base image is in scope.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Comment thread containers/mariadb/mariadb/bindeps.txt
@rebtoor

rebtoor commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

/approve
/lgtm

@openshift-ci

openshift-ci Bot commented Aug 19, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rebtoor

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:

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 d410e7b into openstack-k8s-operators:main Aug 19, 2026
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.

4 participants