Skip to content

single container todo/maria and todo/mongo container#2081

Merged
openshift-merge-bot[bot] merged 7 commits intoopenshift:oadp-devfrom
weshayutin:no-flakes
Feb 12, 2026
Merged

single container todo/maria and todo/mongo container#2081
openshift-merge-bot[bot] merged 7 commits intoopenshift:oadp-devfrom
weshayutin:no-flakes

Conversation

@weshayutin
Copy link
Contributor

no flakes

Velero dev is not interested in the coordination of pods at startup.
Create a single container w/ both db and app in a single container for more consistent testing in prow.
This should avoid

start up probe issues
db connection issues

@coderabbitai
Copy link
Contributor

coderabbitai bot commented Feb 6, 2026

Important

Review skipped

Auto reviews are limited based on label configuration.

🚫 Review skipped — only excluded labels are configured. (1)
  • do-not-merge/work-in-progress

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review

Note

Reviews paused

It looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the reviews.auto_review.auto_pause_after_reviewed_commits setting.

Use the following commands to manage reviews:

  • @coderabbitai resume to resume automatic reviews.
  • @coderabbitai review to trigger a single review.

Use the checkboxes below for quick actions:

  • ▶️ Resume reviews
  • 🔍 Trigger review

Walkthrough

Kubernetes E2E manifests converted mysql/mongo deployments to a unified todolist app (service, deployment, images, ports, probes, volumes); AWS PVC storageClass changed to gp2-csi; OpenStack block PVC added; Go tests updated for todoListReady signature and ginkgo.Entry usage.

Changes

Cohort / File(s) Summary
MySQL-persistent manifests
tests/e2e/sample-applications/mysql-persistent/mysql-persistent-csi.yaml, tests/e2e/sample-applications/mysql-persistent/mysql-persistent-twovol-csi.yaml, tests/e2e/sample-applications/mysql-persistent/mysql-persistent.yaml
Renamed resources from mysqltodolist; replaced MySQL container/image with todolist image; ports changed 3306→8000 (named web); added HTTP startupProbe (/healthz); adjusted/removed readiness/liveness probes; added PVC-backed volumes and updated mounts (/var/lib/mysql/data); removed curl-tool and legacy annotations; added e2e-app: "true" labels.
Mongo-persistent manifests
tests/e2e/sample-applications/mongo-persistent/mongo-persistent-block.yaml, tests/e2e/sample-applications/mongo-persistent/mongo-persistent-csi.yaml, tests/e2e/sample-applications/mongo-persistent/mongo-persistent.yaml
Replaced prior ImageStream/service/deployment shapes with a single todolist Service+Deployment (+Route); main container renamed/updated to todolist image; ports changed 27017→8000; probes converted to HTTP /healthz (startup/readiness/liveness adjustments); added/modified PVC mounts and block volumeDevices where applicable; removed mongo-specific exec probes and curl-tool; added e2e-app/service labels.
AWS PVCs
tests/e2e/sample-applications/mongo-persistent/pvc/aws-block-mode.yaml, tests/e2e/sample-applications/mongo-persistent/pvc/aws.yaml
Changed PersistentVolumeClaim storageClassName from gp3-csigp2-csi; requested capacity unchanged (1Gi).
OpenStack PVC
tests/e2e/sample-applications/mongo-persistent/pvc/openstack-block-mode.yaml
Added a block-mode PVC mongo using ocs-storagecluster-ceph-rbd (1Gi, Block, RWO) for OpenStack tests.
E2E Go tests
tests/e2e/backup_restore_cli_suite_test.go, tests/e2e/backup_restore_suite_test.go
Refactored todoListReady signature to accept deploymentName and sccPrefix; updated all call sites to pass new identifiers (e.g., "todolist" plus db-specific prefix); replaced several ginkgo.PEntryginkgo.Entry.

Estimated code review effort

🎯 4 (Complex) | ⏱️ ~45 minutes

✨ Finishing touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment

Comment @coderabbitai help to get the list of available commands and usage tips.

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2026
@weshayutin weshayutin added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 6, 2026
Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
Copy link
Contributor

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Actionable comments posted: 0

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
tests/e2e/backup_restore_suite_test.go (1)

148-163: ⚠️ Potential issue | 🟠 Major

Parameterize hardcoded values in VerifyBackupRestoreData call to match deploymentName.

The function accepts deploymentName as a parameter but line 160 ignores it when calling VerifyBackupRestoreData, always passing hardcoded "todolist-route", "todolist", "todolist". When Mongo tests call todoListReady(_, _, "mongo", "mongo"), they verify the todolist application instead of mongo. The pattern from restifyReady() (line 172) shows this should instead be parameterized—pass route and service names that correspond to the deployment being tested. Update the function signature or construct appropriate names based on deploymentName before the VerifyBackupRestoreData call.

Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
UID mismatch after KOPIA restore -- without explicit runAsUser: 27,
OpenShift assigned a namespace-range UID that changed when the
namespace was recreated during restore, making the MariaDB
data files inaccessible.

SCC/seccomp incompatibility -- once we pinned UID 27,
the restricted-v2 SCC rejected the pod (UID out of range)
and the mysql-persistent-scc rejected it due to the
seccompProfile setting. Removing the seccomp profile let the correct SCC match.
@weshayutin
Copy link
Contributor Author

/retest

1 similar comment
@weshayutin
Copy link
Contributor Author

/retest

@weshayutin weshayutin changed the title DNM- testing single todo/maria container single container todo/maria and todo/mongo container Feb 11, 2026
@mpryc
Copy link
Contributor

mpryc commented Feb 12, 2026

/test 4.21-e2e-test-aws

mpryc
mpryc previously approved these changes Feb 12, 2026
@mpryc
Copy link
Contributor

mpryc commented Feb 12, 2026

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026
Signed-off-by: Wesley Hayutin <weshayutin@gmail.com>
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 12, 2026
@openshift-ci
Copy link

openshift-ci bot commented Feb 12, 2026

New changes are detected. LGTM label has been removed.

@openshift-ci
Copy link

openshift-ci bot commented Feb 12, 2026

@weshayutin: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@mpryc
Copy link
Contributor

mpryc commented Feb 12, 2026

/lgtm

@weshayutin weshayutin added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Feb 12, 2026
volumeMode: Block
accessModes:
- ReadWriteOnce
storageClassName: gp3-csi
Copy link
Member

Choose a reason for hiding this comment

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

is this necessary?

@openshift-ci
Copy link

openshift-ci bot commented Feb 12, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: kaovilai, mpryc, weshayutin

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 f2ea993 into openshift:oadp-dev Feb 12, 2026
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants