Skip to content

Conversation

@nilo19
Copy link
Contributor

@nilo19 nilo19 commented Dec 8, 2025

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Some changes in go.mod may cause module drifts in other go module. For example, change azclient dependency in root module may affect module consistency for tests/ submodule. This PR adds a github action to guard module drifts across all modules.

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

NONE

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:


@k8s-ci-robot k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. labels Dec 8, 2025
@github-actions github-actions bot added the tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges. label Dec 8, 2025
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nilo19

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:

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

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Dec 8, 2025
@nilo19 nilo19 merged commit 3301d43 into kubernetes-sigs:master Dec 8, 2025
7 of 20 checks passed
@nilo19 nilo19 deleted the chore/mod-drift branch December 8, 2025 12:26
@nilo19
Copy link
Contributor Author

nilo19 commented Dec 8, 2025

/cherrypick release-1.34

@nilo19
Copy link
Contributor Author

nilo19 commented Dec 8, 2025

/cherrypick release-1.33

@nilo19
Copy link
Contributor Author

nilo19 commented Dec 8, 2025

/cherrypick release-1.32

@nilo19
Copy link
Contributor Author

nilo19 commented Dec 8, 2025

/cherrypick release-1.31

@k8s-infra-cherrypick-robot

@nilo19: #9730 failed to apply on top of branch "release-1.34":

Applying: chore: add a github action to guard go module drifts
Applying: fix go module drifts in tests/
Using index info to reconstruct a base tree...
M	tests/go.mod
M	tests/go.sum
Falling back to patching base and 3-way merge...
Auto-merging tests/go.sum
CONFLICT (content): Merge conflict in tests/go.sum
Auto-merging tests/go.mod
CONFLICT (content): Merge conflict in tests/go.mod
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 advice.mergeConflict false"
Patch failed at 0002 fix go module drifts in tests/

In response to this:

/cherrypick release-1.34

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.

@k8s-infra-cherrypick-robot

@nilo19: #9730 failed to apply on top of branch "release-1.33":

Applying: chore: add a github action to guard go module drifts
Applying: fix go module drifts in tests/
Using index info to reconstruct a base tree...
M	tests/go.mod
M	tests/go.sum
Falling back to patching base and 3-way merge...
Auto-merging tests/go.sum
CONFLICT (content): Merge conflict in tests/go.sum
Auto-merging tests/go.mod
CONFLICT (content): Merge conflict in tests/go.mod
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 advice.mergeConflict false"
Patch failed at 0002 fix go module drifts in tests/

In response to this:

/cherrypick release-1.33

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.

@k8s-infra-cherrypick-robot

@nilo19: #9730 failed to apply on top of branch "release-1.32":

Patch is empty.
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 record the empty patch as an empty commit, run "git am --allow-empty".
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"

In response to this:

/cherrypick release-1.32

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.

@k8s-infra-cherrypick-robot

@nilo19: #9730 failed to apply on top of branch "release-1.31":

Applying: chore: add a github action to guard go module drifts
Applying: fix go module drifts in tests/
Using index info to reconstruct a base tree...
A	tests/go.mod
A	tests/go.sum
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): tests/go.sum deleted in HEAD and modified in fix go module drifts in tests/. Version fix go module drifts in tests/ of tests/go.sum left in tree.
CONFLICT (modify/delete): tests/go.mod deleted in HEAD and modified in fix go module drifts in tests/. Version fix go module drifts in tests/ of tests/go.mod left in tree.
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 advice.mergeConflict false"
Patch failed at 0002 fix go module drifts in tests/

In response to this:

/cherrypick release-1.31

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.

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. tide/merge-method-squash Denotes a PR that should be squashed by tide when it merges.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants