kubernetes-sigs / cloud-provider-azure

Cloud provider for Azure
https://cloud-provider-azure.sigs.k8s.io/
Apache License 2.0
256 stars 269 forks source link

Upgrade azclient pkg #6482

Closed zarvd closed 1 week ago

zarvd commented 1 week ago

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

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 commented 1 week ago

Hi @zarvd. 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](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
MartinForReal commented 1 week ago

/lgtm /approve

k8s-ci-robot commented 1 week ago

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MartinForReal, zarvd

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: - ~~[OWNERS](https://github.com/kubernetes-sigs/cloud-provider-azure/blob/master/OWNERS)~~ [MartinForReal] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
MartinForReal commented 1 week ago

/ok-to-test

zarvd commented 1 week ago

/retest

MartinForReal commented 1 week ago

/retest

MartinForReal commented 1 week ago

/retest

zarvd commented 1 week ago

/retest

zarvd commented 1 week ago

/retest

MartinForReal commented 1 week ago

/cherrypick release-1.30

MartinForReal commented 1 week ago

/cherrypick release-1.29

MartinForReal commented 1 week ago

/cherrypick release-1.28

k8s-infra-cherrypick-robot commented 1 week ago

@MartinForReal: #6482 failed to apply on top of branch "release-1.29":

Applying: Upgrade azclient
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
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 Upgrade azclient
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](https://github.com/kubernetes-sigs/cloud-provider-azure/pull/6482#issuecomment-2186800217): >/cherrypick release-1.29 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 1 week ago

@MartinForReal: new pull request created: #6488

In response to [this](https://github.com/kubernetes-sigs/cloud-provider-azure/pull/6482#issuecomment-2186800016): >/cherrypick release-1.30 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.
k8s-infra-cherrypick-robot commented 1 week ago

@MartinForReal: #6482 failed to apply on top of branch "release-1.28":

Applying: Upgrade azclient
Using index info to reconstruct a base tree...
M   go.mod
M   go.sum
M   pkg/provider/config/azure_auth.go
M   vendor/modules.txt
A   vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go deleted in HEAD and modified in Upgrade azclient. Version Upgrade azclient of vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go left in tree.
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging pkg/provider/config/azure_auth.go
CONFLICT (content): Merge conflict in pkg/provider/config/azure_auth.go
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 Upgrade azclient
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](https://github.com/kubernetes-sigs/cloud-provider-azure/pull/6482#issuecomment-2186800409): >/cherrypick release-1.28 Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes-sigs/prow](https://github.com/kubernetes-sigs/prow/issues/new?title=Prow%20issue:) repository.