CNTRLPLANE-1275:Refactor OTE to single-module architecture #891

gangwgr · 2025-11-05T07:22:27Z

Refactor OTE to single-module architecture
As per discussion https://redhat-internal.slack.com/archives/CC3CZCQHM/p1762421042028719

openshift-ci · 2025-11-05T07:22:32Z

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

openshift-ci-robot · 2025-11-05T07:37:00Z

@gangwgr: This pull request references CNTRLPLANE-1275 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.20" instead.

In response to this:

This commit isolates test dependencies from production code by creating a separate Go module for the test extension at test/extended/tests-extension/.

Key changes:

Move test files to test/extended/tests-extension/ directory structure

Create separate go.mod for test dependencies (ginkgo, gomega, openshift-tests-extension)

Remove test dependencies from root go.mod (~XXX lines removed from vendor)

Update root Makefile to use delegation pattern for test extension targets

Update Dockerfile.rhel7 paths to reference new binary location

Update .gitignore to ignore test/extended/tests-extension/bin/

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 openshift-eng/jira-lifecycle-plugin repository.

This commit isolates test dependencies from production code by creating a separate Go module for the test extension at test/extended/tests-extension/. Key changes: - Move test files to test/extended/tests-extension/ directory structure - Create separate go.mod for test dependencies (ginkgo, gomega, openshift-tests-extension) - Remove test dependencies from root go.mod (~XXX lines removed from vendor) - Update root Makefile to use delegation pattern for test extension targets - Update Dockerfile.rhel7 paths to reference new binary location - Update .gitignore to ignore test/extended/tests-extension/bin/ Benefits: - Smaller production images (test dependencies not included in production builds) - Faster builds (production builds don't need to vendor test dependencies) - Cleaner dependency management (test dependencies isolated) - Better CI performance (smaller images, faster pulls, less storage) Related: Similar to openshift/openshift-apiserver#571

openshift-ci-robot · 2025-11-24T09:01:33Z

@gangwgr: This pull request references CNTRLPLANE-1275 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the bug to target either version "4.21." or "openshift-4.21.", but it targets "openshift-4.20" instead.

In response to this:

Refactor OTE to single-module architecture
As per discussion https://redhat-internal.slack.com/archives/CC3CZCQHM/p1762421042028719

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci · 2025-11-24T09:07:34Z

@gangwgr: 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/e2e-tests-extension	`db7055b`	link	true	`/test e2e-tests-extension`
ci/prow/okd-scos-e2e-aws-ovn	`db7055b`	link	false	`/test okd-scos-e2e-aws-ovn`

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.

wangke19 · 2025-11-24T10:27:01Z

test/OWNERS

@@ -0,0 +1,10 @@
+reviewers:


Add QE team members.

wangke19 · 2025-11-24T10:28:45Z

.gitignore

 _output
 telepresence.log
-.openshift-tests-extension/openshift_payload_*.json
+/test/extended/tests-extension/bin/


I don't think we have this path.

- Updated library-go to v0.0.0-20251104164011-e9c2485b059c - Resolved go.sum conflicts - Re-vendored dependencies

atiratree · 2025-11-26T10:31:56Z

Makefile

 # See vendor/github.com/openshift/build-machinery-go/scripts/run-telepresence.sh for usage and configuration details
 export TP_DEPLOYMENT_YAML ?=./manifests/0000_25_kube-controller-manager-operator_06_deployment.yaml
 export TP_CMD_PATH ?=./cmd/cluster-kube-controller-manager-operator
-


Could we please add a new target called cluster-kube-controller-manager-operator to have the ability to simply build just the operator binary (e.g. for a development) withouth building the tests?

@atiratree Earlier we are have separate target, but Lukas suggested to use single target. We are following same standard in all control-plane repos

Yeah. that is fine, but having the ability to compile just the binary is also useful sometimes. Anyway, we can do that later I guess.

atiratree · 2025-11-26T10:32:12Z

cmd/cluster-kube-controller-manager-operator-tests-ext/main.go

+	if v := version.Get().String(); len(v) == 0 {
+		cmd.Version = "<unknown>"
+	} else {
+		cmd.Version = v


who are the consumers of this version?

The --version flag: Cobra automatically adds a --version flag (and short flag -v) to the root command when the Version field is set

End users: Anyone running the cluster-kube-controller-manager-operator-tests-ext binary can use:
./cluster-kube-controller-manager-operator-tests-ext --version

Ack, so for now it is just for convenience.

atiratree · 2025-11-26T17:42:00Z

/approve

atiratree · 2025-11-26T17:43:21Z

/lgtm

openshift-ci · 2025-11-26T17:43:41Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: atiratree, gangwgr

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

The pull request process is described here

Needs approval from an approver in each of these files:

~~OWNERS~~ [atiratree]

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

atiratree · 2025-11-27T11:20:11Z

build / ci passing
/verified by @atiratree

openshift-ci-robot · 2025-11-27T11:20:22Z

@atiratree: This PR has been marked as verified by @atiratree.

In response to this:

build / ci passing
/verified by @atiratree

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 openshift-eng/jira-lifecycle-plugin repository.

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 5, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2025

gangwgr force-pushed the test-module-infra-only branch from 44e7612 to 70f4334 Compare November 5, 2025 07:26

Fixing arch issue

f7a23c8

gangwgr force-pushed the test-module-infra-only branch from 70f4334 to 615cb5f Compare November 5, 2025 07:33

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 5, 2025

gangwgr changed the title ~~Create separate Go module for test extension~~ CNTRLPLANE-1275:Create separate Go module for test extension Nov 5, 2025

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Nov 5, 2025

gangwgr marked this pull request as ready for review November 5, 2025 07:53

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 5, 2025

openshift-ci bot requested review from atiratree and deads2k November 5, 2025 07:54

gangwgr force-pushed the test-module-infra-only branch from 615cb5f to db7055b Compare November 5, 2025 08:17

gangwgr changed the title ~~CNTRLPLANE-1275:Create separate Go module for test extension~~ [WIP]CNTRLPLANE-1275:Create separate Go module for test extension Nov 6, 2025

openshift-ci bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 6, 2025

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 11, 2025

gangwgr force-pushed the test-module-infra-only branch from db7055b to 4f0d3b3 Compare November 24, 2025 09:00

gangwgr changed the title ~~[WIP]CNTRLPLANE-1275:Create separate Go module for test extension~~ [WIP]CNTRLPLANE-1275:Refactor OTE to single-module architecture Nov 24, 2025

openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 24, 2025

gangwgr force-pushed the test-module-infra-only branch 2 times, most recently from 9a9dce0 to 31d8124 Compare November 24, 2025 09:23

gangwgr changed the title ~~[WIP]CNTRLPLANE-1275:Refactor OTE to single-module architecture~~ CNTRLPLANE-1275:Refactor OTE to single-module architecture Nov 24, 2025

openshift-ci bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Nov 24, 2025

gangwgr force-pushed the test-module-infra-only branch from 31d8124 to 0c8e935 Compare November 24, 2025 10:19

wangke19 reviewed Nov 24, 2025

View reviewed changes

gangwgr force-pushed the test-module-infra-only branch from 0c8e935 to 665b521 Compare November 24, 2025 10:30

Merge upstream/main to resolve conflicts

51f99cc

- Updated library-go to v0.0.0-20251104164011-e9c2485b059c - Resolved go.sum conflicts - Re-vendored dependencies

gangwgr force-pushed the test-module-infra-only branch from 665b521 to 51f99cc Compare November 24, 2025 10:35

atiratree reviewed Nov 26, 2025

View reviewed changes

openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 26, 2025

openshift-ci bot assigned atiratree Nov 26, 2025

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 26, 2025

openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Nov 27, 2025

openshift-merge-bot bot merged commit 395de96 into openshift:main Nov 27, 2025
11 checks passed

CNTRLPLANE-1275:Refactor OTE to single-module architecture #891

CNTRLPLANE-1275:Refactor OTE to single-module architecture #891

Uh oh!

Conversation

gangwgr commented Nov 5, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Nov 5, 2025

Uh oh!

openshift-ci-robot commented Nov 5, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Nov 24, 2025 • edited by openshift-ci bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Nov 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

atiratree commented Nov 26, 2025

Uh oh!

atiratree commented Nov 26, 2025

Uh oh!

openshift-ci bot commented Nov 26, 2025

Uh oh!

atiratree commented Nov 27, 2025

Uh oh!

openshift-ci-robot commented Nov 27, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

gangwgr commented Nov 5, 2025 •

edited

Loading

openshift-ci-robot commented Nov 5, 2025 •

edited by openshift-ci bot

Loading

openshift-ci-robot commented Nov 24, 2025 •

edited by openshift-ci bot

Loading

openshift-ci bot commented Nov 24, 2025 •

edited

Loading