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.

Sign up for GitHub

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

Jump to bottom

Migrate RouteTableClient to SDK track v2 #7517

Merged
merged 4 commits into from
Nov 12, 2024
Merged

Migrate RouteTableClient to SDK track v2 #7517

merged 4 commits into from
Nov 12, 2024

Conversation

zarvd
Copy link
Contributor

@zarvd zarvd commented Nov 8, 2024

What type of PR is this?

/kind feature

What this PR does / why we need it:

Migrate RouteTableClient to SDK track v2

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 k8s-ci-robot added release-note-none Denotes a PR that doesn't merit a release note. kind/feature Categorizes issue or PR as related to a new feature. labels Nov 8, 2024
@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 Nov 8, 2024
@k8s-ci-robot
Copy link
Contributor

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. 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 the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Nov 8, 2024
@MartinForReal
Copy link
Contributor

/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 Nov 8, 2024
@zarvd zarvd force-pushed the feat/azclient/rt-repo branch 3 times, most recently from 029fb93 to f297adf Compare November 11, 2024 01:47
@zarvd
Copy link
Contributor Author

zarvd commented Nov 11, 2024

/retest

@zarvd
Copy link
Contributor Author

zarvd commented Nov 11, 2024

/retest

1 similar comment
@MartinForReal
Copy link
Contributor

/retest

@zarvd
Copy link
Contributor Author

zarvd commented Nov 12, 2024

/retest

@MartinForReal
Copy link
Contributor

/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 Nov 12, 2024
@k8s-ci-robot
Copy link
Contributor

[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:

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 Nov 12, 2024
@k8s-ci-robot k8s-ci-robot merged commit f0d8abc into kubernetes-sigs:master Nov 12, 2024
18 checks passed
@MartinForReal
Copy link
Contributor

/cherrypick release-1.31

@MartinForReal
Copy link
Contributor

/cherrypick release-1.30

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #7517 failed to apply on top of branch "release-1.31":

Applying: Migrate RouteTableClient to SDK track v2
Using index info to reconstruct a base tree...
M	pkg/provider/azure.go
M	pkg/provider/azure_fakes.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Removing pkg/provider/azure_routetable_repo_test.go
Removing pkg/provider/azure_routetable_repo.go
Auto-merging pkg/provider/azure_fakes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_fakes.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Removing pkg/azureclients/routetableclient/mockroutetableclient/doc.go
Removing pkg/azureclients/routetableclient/interface.go
Removing pkg/azureclients/routetableclient/doc.go
Removing pkg/azureclients/routetableclient/azure_routetableclient_test.go
Removing pkg/azureclients/routetableclient/azure_routetableclient.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Migrate RouteTableClient to SDK track v2

In response to this:

/cherrypick release-1.31

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
Copy link

@MartinForReal: #7517 failed to apply on top of branch "release-1.30":

Applying: Migrate RouteTableClient to SDK track v2
Using index info to reconstruct a base tree...
M	pkg/azureclients/routetableclient/azure_routetableclient_test.go
M	pkg/provider/azure.go
M	pkg/provider/azure_fakes.go
M	pkg/provider/azure_routes.go
M	pkg/provider/azure_routes_test.go
M	pkg/provider/azure_routetable_repo.go
M	pkg/provider/azure_routetable_repo_test.go
M	pkg/provider/azure_vmsets_repo.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/azure_vmsets_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_vmsets_repo.go
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo_test.go left in tree.
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo.go left in tree.
Auto-merging pkg/provider/azure_routes_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes_test.go
Auto-merging pkg/provider/azure_routes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes.go
Auto-merging pkg/provider/azure_fakes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_fakes.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Removing pkg/azureclients/routetableclient/mockroutetableclient/doc.go
Removing pkg/azureclients/routetableclient/interface.go
Removing pkg/azureclients/routetableclient/doc.go
CONFLICT (modify/delete): pkg/azureclients/routetableclient/azure_routetableclient_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/azureclients/routetableclient/azure_routetableclient_test.go left in tree.
Removing pkg/azureclients/routetableclient/azure_routetableclient.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Migrate RouteTableClient to SDK track v2

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.

@MartinForReal
Copy link
Contributor

/cherrypick release-1.31

@MartinForReal
Copy link
Contributor

/cherrypick release-1.30

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: new pull request created: #7571

In response to this:

/cherrypick release-1.31

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
Copy link

@MartinForReal: #7517 failed to apply on top of branch "release-1.30":

Applying: Migrate RouteTableClient to SDK track v2
Using index info to reconstruct a base tree...
M	pkg/azureclients/routetableclient/azure_routetableclient_test.go
M	pkg/provider/azure.go
M	pkg/provider/azure_routes.go
M	pkg/provider/azure_routes_test.go
M	pkg/provider/azure_routetable_repo.go
M	pkg/provider/azure_routetable_repo_test.go
M	pkg/provider/azure_vmsets_repo.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/azure_vmsets_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_vmsets_repo.go
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo_test.go left in tree.
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo.go left in tree.
Auto-merging pkg/provider/azure_routes_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes_test.go
Auto-merging pkg/provider/azure_routes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Removing pkg/azureclients/routetableclient/mockroutetableclient/doc.go
Removing pkg/azureclients/routetableclient/interface.go
Removing pkg/azureclients/routetableclient/doc.go
CONFLICT (modify/delete): pkg/azureclients/routetableclient/azure_routetableclient_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/azureclients/routetableclient/azure_routetableclient_test.go left in tree.
Removing pkg/azureclients/routetableclient/azure_routetableclient.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Migrate RouteTableClient to SDK track v2

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.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Nov 13, 2024
Merged
@MartinForReal
Copy link
Contributor

/cherrypick release-1.30

@k8s-infra-cherrypick-robot
Copy link

@MartinForReal: #7517 failed to apply on top of branch "release-1.30":

Applying: Migrate RouteTableClient to SDK track v2
Using index info to reconstruct a base tree...
M	pkg/azureclients/routetableclient/azure_routetableclient_test.go
M	pkg/provider/azure.go
M	pkg/provider/azure_routes.go
M	pkg/provider/azure_routes_test.go
M	pkg/provider/azure_routetable_repo.go
M	pkg/provider/azure_routetable_repo_test.go
M	pkg/provider/azure_vmsets_repo.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/azure_vmsets_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_vmsets_repo.go
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo_test.go left in tree.
CONFLICT (modify/delete): pkg/provider/azure_routetable_repo.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/provider/azure_routetable_repo.go left in tree.
Auto-merging pkg/provider/azure_routes_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes_test.go
Auto-merging pkg/provider/azure_routes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_routes.go
Auto-merging pkg/provider/azure.go
CONFLICT (content): Merge conflict in pkg/provider/azure.go
Removing pkg/azureclients/routetableclient/mockroutetableclient/doc.go
Removing pkg/azureclients/routetableclient/interface.go
Removing pkg/azureclients/routetableclient/doc.go
CONFLICT (modify/delete): pkg/azureclients/routetableclient/azure_routetableclient_test.go deleted in Migrate RouteTableClient to SDK track v2 and modified in HEAD. Version HEAD of pkg/azureclients/routetableclient/azure_routetableclient_test.go left in tree.
Removing pkg/azureclients/routetableclient/azure_routetableclient.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Migrate RouteTableClient to SDK track v2

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
Reviewers

@andyzhangx andyzhangx Awaiting requested review from andyzhangx

@feiskyer feiskyer Awaiting requested review from feiskyer

Assignees

@MartinForReal MartinForReal

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/feature Categorizes issue or PR as related to a new feature. 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. release-note-none Denotes a PR that doesn't merit a release note. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@zarvd @k8s-ci-robot @MartinForReal @k8s-infra-cherrypick-robot