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

cleanup: upgrade golint version and fix golint errors #2487

Merged
merged 1 commit into from
Sep 4, 2024

Conversation

Zhupku
Copy link
Contributor

@Zhupku Zhupku commented Sep 2, 2024

What type of PR is this?

What this PR does / why we need it:

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 2, 2024
@k8s-ci-robot
Copy link
Contributor

Hi @Zhupku. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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-ci-robot k8s-ci-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Sep 2, 2024
@andyzhangx andyzhangx changed the title revert: creating private endpoints for multiple subnets cleanup: upgrade golint version and fix golint errors Sep 3, 2024
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Sep 4, 2024
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.

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Sep 4, 2024
@k8s-ci-robot
Copy link
Contributor

@Zhupku: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azuredisk-csi-driver-e2e-capz-windows-2022 c6ac3f8 link true /test pull-azuredisk-csi-driver-e2e-capz-windows-2022

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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.

@andyzhangx
Copy link
Member

/retest

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

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx, Zhupku

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 Sep 4, 2024
@andyzhangx andyzhangx merged commit 87978f5 into kubernetes-sigs:master Sep 4, 2024
23 of 25 checks passed
@andyzhangx
Copy link
Member

/cherrypick release-1.30

@andyzhangx
Copy link
Member

/cherrypick release-1.29

@k8s-infra-cherrypick-robot

@andyzhangx: #2487 failed to apply on top of branch "release-1.29":

Applying: cleanup: upgrade golint version and fix golint errors
Using index info to reconstruct a base tree...
M	.github/workflows/static.yaml
A	pkg/azuredisk/azure_controller_common.go
A	pkg/azuredisk/azure_controller_common_test.go
A	pkg/azuredisk/azure_managedDiskController.go
A	pkg/azuredisk/azure_managedDiskController_test.go
M	pkg/azuredisk/azuredisk.go
A	pkg/azuredisk/azuredisk_option_test.go
M	pkg/azuredisk/controllerserver.go
M	pkg/azuredisk/controllerserver_v2.go
M	pkg/azuredisk/fake_azuredisk.go
M	pkg/azuredisk/nodeserver.go
M	pkg/azuredisk/nodeserver_test.go
M	pkg/azuredisk/nodeserver_v2.go
M	pkg/csi-common/utils.go
M	pkg/csi-common/utils_test.go
M	pkg/os/volume/volume.go
M	test/e2e/suite_test.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_common.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_empty.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/configloader/loader_empty.go
Auto-merging test/e2e/suite_test.go
Auto-merging pkg/os/volume/volume.go
Auto-merging pkg/csi-common/utils_test.go
Auto-merging pkg/csi-common/utils.go
CONFLICT (content): Merge conflict in pkg/csi-common/utils.go
Auto-merging pkg/azuredisk/nodeserver_v2.go
Auto-merging pkg/azuredisk/nodeserver_test.go
Auto-merging pkg/azuredisk/nodeserver.go
Auto-merging pkg/azuredisk/fake_azuredisk.go
Auto-merging pkg/azuredisk/controllerserver_v2.go
CONFLICT (content): Merge conflict in pkg/azuredisk/controllerserver_v2.go
Auto-merging pkg/azuredisk/controllerserver.go
CONFLICT (content): Merge conflict in pkg/azuredisk/controllerserver.go
Auto-merging pkg/azuredisk/azuredisk.go
CONFLICT (modify/delete): pkg/azuredisk/azure_managedDiskController_test.go deleted in HEAD and modified in cleanup: upgrade golint version and fix golint errors. Version cleanup: upgrade golint version and fix golint errors of pkg/azuredisk/azure_managedDiskController_test.go left in tree.
CONFLICT (modify/delete): pkg/azuredisk/azure_controller_common_test.go deleted in HEAD and modified in cleanup: upgrade golint version and fix golint errors. Version cleanup: upgrade golint version and fix golint errors of pkg/azuredisk/azure_controller_common_test.go left in tree.
Auto-merging .github/workflows/static.yaml
CONFLICT (content): Merge conflict in .github/workflows/static.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 cleanup: upgrade golint version and fix golint errors
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.29

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

@andyzhangx: new pull request created: #2489

In response to this:

/cherrypick release-1.30

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. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants