Enable go multi-module workspace by awels · Pull Request #4035 · kubevirt/containerized-data-importer

awels · 2026-02-10T21:42:06Z

What this PR does / why we need it:
Similar to KubeVirt kubevirt/kubevirt#14485 set up go workspace so we don't have the symlink to staging anymore. This will ensure hermeto no longer complains about changes to the modules.txt

Fixes https://issues.redhat.com/browse/CNV-60075

Special notes for your reviewer:

Release note:

NONE

awels · 2026-02-11T14:53:15Z

/test pull-containerized-data-importer-fossa

coveralls · 2026-02-11T16:25:44Z

coverage: 49.337% (+0.04%) from 49.3%
when pulling ab6a282 on awels:go-workspace
into 2acfe66 on kubevirt:main.

awels · 2026-02-11T20:25:28Z

/test pull-containerized-data-importer-fossa

awels · 2026-02-18T13:25:40Z

/cc @akalenyu

akalenyu

in general looks fine just worried about the sed dance around the group name

akalenyu · 2026-02-18T13:31:44Z

 ${SCRIPT_ROOT}/bin/openapi-spec-generator >${SCRIPT_ROOT}/api/openapi-spec/swagger.json

 echo "************* running controller-gen to generate schema yaml ********************"
+# controller-gen fails on vendored k8s.io/api/core/v1/doc.go due to empty +groupName= marker (see https://github.com/kubernetes/kubernetes/issues)


this was supposed to be a link to a particular issue or just the landing page?

in any case how come we hit this here? api version bump? why not bump controller-gen in that case?

yeah you are right, I updated codegen and the marker issue went away.

akalenyu · 2026-02-18T13:39:55Z

@@ -0,0 +1,7 @@
+go 1.24.0


I picked this line randomly to start the discussion. I noticed we are missing 2 things from the kubevirt referenced PR:

bazel file changes (vendor->staging)

symlink kubevirt/kubevirt@b2bbf1c#r2068133554 (mockgen)

I just want to make sure this is fine

So the bazel file changes are related to client-go which we don't use, we use the runtime controller library instead which doesn't have the issue that is being solved. As for the symlink, I think that is fixing a specific kubevirt issue, that I don't think CDI has, so it didn't make sense to do that.

akalenyu · 2026-02-18T13:45:29Z

@Acedus I think you had a PR to kubevirt saving it from some go work consequence?

Acedus · 2026-02-18T14:33:44Z

@Acedus I think you had a PR to kubevirt saving it from some go work consequence?

Yeah it was a bug in go cmd that I fixed at the time: golang/go@1ebebf1 but I see that it only made it in 1.26, might be worth to see if my workaround applies here: kubevirt/kubevirt#14951

awels · 2026-03-06T14:01:28Z

I just tried make clean with this PR and it worked without issues, maybe I am missing something, but everything appears to work as expected.

akalenyu · 2026-03-08T10:14:47Z

+revert-deps-replace:
+	git checkout -- ${PWD}/vendor/k8s.io/api/core/v1/doc.go


we don't need this anymore right?

akalenyu

/approve

kubevirt-bot · 2026-03-08T18:59:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: akalenyu

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~~ [akalenyu]

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

akalenyu · 2026-03-08T19:00:20Z

 // +k8s:protobuf-gen=package
 // +k8s:prerelease-lifecycle-gen=true
-// +groupName=
+// +groupName=core


guess you also want this reverted

akalenyu · 2026-03-09T12:24:35Z

are we missing the controller-gen bump in the builder? https://prow.ci.kubevirt.io/view/gs/kubevirt-prow/pr-logs/pull/kubevirt_containerized-data-importer/4035/pull-cdi-apidocs/2030977819466534912

awels · 2026-03-09T12:50:57Z

Maybe, I guess I am making a new PR that bumps to controller gen version in the builder.

awels · 2026-03-09T13:37:34Z

Create a PR to update the builder #4051

Similar to KubeVirt kubevirt/kubevirt#14485 set up go workspace so we don't have the symlink to staging anymore. This will ensure hermeto no longer complains about changes to the modules.txt Signed-off-by: Alexander Wels <[email protected]>

Signed-off-by: Alexander Wels <[email protected]>

akalenyu · 2026-03-11T17:36:00Z

I think were missing a make generate and otherwise should be good to go

controller gen Signed-off-by: Alexander Wels <[email protected]>

awels · 2026-03-12T15:11:39Z

yeah, ran the make generate, should be good now.

akalenyu · 2026-03-12T16:28:11Z

/lgtm
/retest

awels · 2026-03-13T14:26:34Z

/test pull-containerized-data-importer-fossa

awels · 2026-03-24T14:06:33Z

/cherry-pick release-v1.64

kubevirt-bot · 2026-03-24T14:07:21Z

@awels: #4035 failed to apply on top of branch "release-v1.64":

Applying: Enable go multi-module workspace
Using index info to reconstruct a base tree...
M	Makefile
M	hack/update-codegen.sh
M	pkg/operator/resources/crds_generated.go
M	staging/src/kubevirt.io/containerized-data-importer-api/go.mod
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/kubevirt.io/containerized-data-importer-api
Auto-merging staging/src/kubevirt.io/containerized-data-importer-api/go.mod
Auto-merging pkg/operator/resources/crds_generated.go
Auto-merging hack/update-codegen.sh
Auto-merging Makefile
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config set advice.mergeConflict false"
Patch failed at 0001 Enable go multi-module workspace

Details

In response to this:

/cherry-pick release-v1.64

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.

* Enable go multi-module workspace Similar to KubeVirt kubevirt/kubevirt#14485 set up go workspace so we don't have the symlink to staging anymore. This will ensure hermeto no longer complains about changes to the modules.txt Signed-off-by: Alexander Wels <[email protected]> * Re-add vendoring in containerized-data-importer-api Signed-off-by: Alexander Wels <[email protected]> * Updated the cdi builder to include the new controller gen Signed-off-by: Alexander Wels <[email protected]> --------- Signed-off-by: Alexander Wels <[email protected]>

kubevirt-bot added release-note-none Denotes a PR that doesn't merit a release note. dco-signoff: yes Indicates the PR's author has DCO signed all their commits. size/L labels Feb 10, 2026

kubevirt-bot requested review from aglitke and arnongilboa February 10, 2026 21:42

awels force-pushed the go-workspace branch 2 times, most recently from 7250fe2 to 1b4fe7f Compare February 11, 2026 14:37

awels force-pushed the go-workspace branch from 1b4fe7f to 595fb2b Compare February 11, 2026 16:06

kubevirt-bot requested a review from akalenyu February 18, 2026 13:25

akalenyu reviewed Feb 18, 2026

View reviewed changes

awels force-pushed the go-workspace branch from d75fa73 to 732e916 Compare March 6, 2026 13:45

akalenyu reviewed Mar 8, 2026

View reviewed changes

awels force-pushed the go-workspace branch from 732e916 to 075bcaa Compare March 8, 2026 18:52

akalenyu approved these changes Mar 8, 2026

View reviewed changes

kubevirt-bot assigned akalenyu Mar 8, 2026

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 8, 2026

kubevirt-bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Mar 8, 2026

akalenyu reviewed Mar 8, 2026

View reviewed changes

awels force-pushed the go-workspace branch from 075bcaa to ab6a282 Compare March 9, 2026 12:03

kubevirt-bot removed the lgtm Indicates that a PR is ready to be merged. label Mar 9, 2026

awels added 2 commits March 11, 2026 09:26

Enable go multi-module workspace

13243d2

Similar to KubeVirt kubevirt/kubevirt#14485 set up go workspace so we don't have the symlink to staging anymore. This will ensure hermeto no longer complains about changes to the modules.txt Signed-off-by: Alexander Wels <[email protected]>

Re-add vendoring in containerized-data-importer-api

98b418d

Signed-off-by: Alexander Wels <[email protected]>

awels force-pushed the go-workspace branch from ab6a282 to e36baa3 Compare March 11, 2026 14:28

Updated the cdi builder to include the new

b8e2895

controller gen Signed-off-by: Alexander Wels <[email protected]>

awels force-pushed the go-workspace branch from e36baa3 to b8e2895 Compare March 12, 2026 14:59

kubevirt-bot added the lgtm Indicates that a PR is ready to be merged. label Mar 12, 2026

Acedus approved these changes Mar 12, 2026

View reviewed changes

kubevirt-bot assigned Acedus Mar 12, 2026

kubevirt-bot merged commit 047a824 into kubevirt:main Mar 13, 2026
21 checks passed

awels mentioned this pull request Apr 2, 2026

[release-v1.64] Enable go multi-module workspace (#4035) #4082

Open

		revert-deps-replace:
		git checkout -- ${PWD}/vendor/k8s.io/api/core/v1/doc.go

Conversation

awels commented Feb 10, 2026

Uh oh!

awels commented Feb 11, 2026

Uh oh!

coveralls commented Feb 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

awels commented Feb 11, 2026

Uh oh!

awels commented Feb 18, 2026

Uh oh!

akalenyu left a comment

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!

akalenyu commented Feb 18, 2026

Uh oh!

Acedus commented Feb 18, 2026

Uh oh!

awels commented Mar 6, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akalenyu left a comment

Choose a reason for hiding this comment

Uh oh!

kubevirt-bot commented Mar 8, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

akalenyu commented Mar 9, 2026

Uh oh!

awels commented Mar 9, 2026

Uh oh!

awels commented Mar 9, 2026

Uh oh!

akalenyu commented Mar 11, 2026

Uh oh!

awels commented Mar 12, 2026

Uh oh!

akalenyu commented Mar 12, 2026

Uh oh!

awels commented Mar 13, 2026

Uh oh!

Uh oh!

awels commented Mar 24, 2026

Uh oh!

kubevirt-bot commented Mar 24, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

coveralls commented Feb 11, 2026 •

edited

Loading