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

fix: match tags issue in account search logic #1253

Merged
merged 1 commit into from
Feb 20, 2024

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: match tags issue in account search logic
related to fix: kubernetes-sigs/cloud-provider-azure#5465

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

fix: match tags issue in account search logic

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 20, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: andyzhangx

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 Feb 20, 2024
@andyzhangx andyzhangx merged commit 827b1d1 into kubernetes-sigs:master Feb 20, 2024
20 of 21 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.23

@k8s-infra-cherrypick-robot

@andyzhangx: #1253 failed to apply on top of branch "release-1.23":

Applying: fix: match tags issue in account search logic
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/README.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/assets.json
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/autorest.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/constants.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/models.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/models_serde.go
M	vendor/github.com/google/uuid/CHANGELOG.md
A	vendor/github.com/google/uuid/version7.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory_gen.go
A	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/mock_azclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/consts/consts.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_common.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_standard.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmss.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmssflex.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_fakes.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_loadbalancer.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_mock_vmsets.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_standard.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_storageaccount.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_utils.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_utils.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_storageaccount.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_storageaccount.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_standard.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_mock_vmsets.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_mock_vmsets.go
Removing vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_managedDiskController.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_loadbalancer.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_fakes.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmssflex.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmssflex.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmss.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_vmss.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_standard.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_standard.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_common.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure_controller_common.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/provider/azure.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/consts/consts.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/interface.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/interface.go
CONFLICT (modify/delete): vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/mock_azclient/interface.go deleted in HEAD and modified in fix: match tags issue in account search logic. Version fix: match tags issue in account search logic of vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/mock_azclient/interface.go left in tree.
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory_gen.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory_gen.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory.go
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/interface.go
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Removing vendor/k8s.io/cloud-provider/volume/helpers/zones.go
Removing vendor/k8s.io/cloud-provider/volume/helpers/rounding.go
Removing vendor/k8s.io/cloud-provider/volume/errors/errors.go
CONFLICT (modify/delete): vendor/github.com/google/uuid/version7.go deleted in HEAD and modified in fix: match tags issue in account search logic. Version fix: match tags issue in account search logic of vendor/github.com/google/uuid/version7.go left in tree.
Auto-merging vendor/github.com/google/uuid/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/google/uuid/CHANGELOG.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/models_serde.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/models.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/constants.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/constants.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/autorest.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/autorest.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/assets.json
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/assets.json
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/README.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/compute/armcompute/v5/CHANGELOG.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/internal/shared/constants.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/azcore/CHANGELOG.md
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
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 fix: match tags issue in account search logic
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.23

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/bug Categorizes issue or PR as related to a bug. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants