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

chore: fix implictly required vendor #775

Merged
merged 1 commit into from Aug 26, 2021
Merged

chore: fix implictly required vendor #775

merged 1 commit into from Aug 26, 2021

Conversation

nilo19
Copy link
Contributor

@nilo19 nilo19 commented Aug 26, 2021

What type of PR is this?

Uncomment only one /kind <> line, hit enter to put that in a new line, and remove leading whitespaces from that line:

/kind api-change
/kind bug
/kind cleanup
/kind design
/kind documentation
/kind failing-test
/kind feature
/kind flake

/kind failing-test

What this PR does / why we need it:

go get github.com/fsnotify/fsnotify@v1.4.9
go mod tidy
go mod vendor

Related: #774 (comment)

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Release note:

chore: fix implictly required vendor

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Aug 26, 2021
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Aug 26, 2021
@coveralls
Copy link

coveralls commented Aug 26, 2021

Coverage Status

Coverage remained the same at 80.584% when pulling 9fc7a48 on nilo19:fix/vendor into 9869e9d on kubernetes-sigs:master.

@nilo19
Copy link
Contributor Author

nilo19 commented Aug 26, 2021

/test pull-cloud-provider-azure-check

Copy link
Member

@andyzhangx andyzhangx left a comment

Choose a reason for hiding this comment

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

/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 Aug 26, 2021
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, 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 merged commit 7160b8c into kubernetes-sigs:master Aug 26, 2021
@nilo19 nilo19 deleted the fix/vendor branch August 26, 2021 07:35
@MartinForReal
Copy link
Contributor

/cherrypick release-1.1

@MartinForReal
Copy link
Contributor

/cherrypick release-1.0

@k8s-infra-cherrypick-robot

@MartinForReal: #775 failed to apply on top of branch "release-1.1":

Applying: chore: fix implictly required vendor
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/azureclients/armclient/azure_armclient_test.go
M	pkg/azureclients/loadbalancerclient/interface.go
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
Auto-merging pkg/azureclients/loadbalancerclient/interface.go
Auto-merging pkg/azureclients/armclient/azure_armclient_test.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: fix implictly required vendor
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:

/cherrypick release-1.1

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

@MartinForReal: #775 failed to apply on top of branch "release-1.0":

Applying: chore: fix implictly required vendor
Using index info to reconstruct a base tree...
M	go.mod
M	pkg/azureclients/armclient/azure_armclient_test.go
M	pkg/azureclients/loadbalancerclient/interface.go
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
Auto-merging pkg/azureclients/loadbalancerclient/interface.go
Auto-merging pkg/azureclients/armclient/azure_armclient_test.go
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 chore: fix implictly required vendor
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:

/cherrypick release-1.0

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. kind/failing-test Categorizes issue or PR as related to a consistently or frequently failing test. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. 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.

None yet

6 participants