Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 controllers/vmware fix test to not contain data race #2672

Merged

Conversation

chrischdi
Copy link
Member

What this PR does / why we need it:

Fixes the error fatal error: concurrent map read and map write by not re-using scheme.Scheme but using our own runtime.Scheme instead.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #2325

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 29, 2024
@k8s-ci-robot k8s-ci-robot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Jan 29, 2024
Copy link

codecov bot commented Jan 29, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Comparison is base (156564e) 64.77% compared to head (b87d063) 64.91%.
Report is 15 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #2672      +/-   ##
==========================================
+ Coverage   64.77%   64.91%   +0.13%     
==========================================
  Files         118      118              
  Lines        8580     8580              
==========================================
+ Hits         5558     5570      +12     
+ Misses       2594     2583      -11     
+ Partials      428      427       -1     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@chrischdi
Copy link
Member Author

/retest

@sbueringer
Copy link
Member

Thx!

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 29, 2024
@k8s-ci-robot
Copy link
Contributor

LGTM label has been added.

Git tree hash: 4343a6c60e0d686bc3eb0faa87808027504398ec

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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 the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 29, 2024
@k8s-ci-robot k8s-ci-robot merged commit 3b0169e into kubernetes-sigs:main Jan 29, 2024
19 checks passed
@k8s-ci-robot k8s-ci-robot added this to the v1.9 milestone Jan 29, 2024
@chrischdi
Copy link
Member Author

This still happens on older release branches:

/cherry-pick release-1.9

@chrischdi
Copy link
Member Author

/cherry-pick release-1.8

@chrischdi
Copy link
Member Author

/cherry-pick release-1.7

@chrischdi
Copy link
Member Author

/cherry-pick release-1.6

@k8s-infra-cherrypick-robot

@chrischdi: #2672 failed to apply on top of branch "release-1.8":

Applying: controllers/vmware fix test to not contain data race
Using index info to reconstruct a base tree...
M	controllers/vmware/test/controllers_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vmware/test/controllers_test.go
CONFLICT (content): Merge conflict in controllers/vmware/test/controllers_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 controllers/vmware fix test to not contain data race
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.8

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/test-infra repository.

@k8s-infra-cherrypick-robot

@chrischdi: #2672 failed to apply on top of branch "release-1.7":

Applying: controllers/vmware fix test to not contain data race
Using index info to reconstruct a base tree...
M	controllers/vmware/test/controllers_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vmware/test/controllers_test.go
CONFLICT (content): Merge conflict in controllers/vmware/test/controllers_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 controllers/vmware fix test to not contain data race
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.7

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/test-infra repository.

@k8s-infra-cherrypick-robot

@chrischdi: new pull request created: #2760

In response to this:

This still happens on older release branches:

/cherry-pick release-1.9

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/test-infra repository.

@k8s-infra-cherrypick-robot

@chrischdi: #2672 failed to apply on top of branch "release-1.6":

Applying: controllers/vmware fix test to not contain data race
Using index info to reconstruct a base tree...
M	controllers/vmware/test/controllers_test.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/vmware/test/controllers_test.go
CONFLICT (content): Merge conflict in controllers/vmware/test/controllers_test.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 controllers/vmware fix test to not contain data race
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-1.6

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/test-infra 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. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Test TestAPIs in controllers/vmware/test is flaky
4 participants