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

Track2 sdk:migrate nsg client to track2 one #7155

Merged
merged 1 commit into from
Sep 30, 2024
Merged

Track2 sdk:migrate nsg client to track2 one #7155

merged 1 commit into from
Sep 30, 2024

Conversation

MartinForReal
Copy link
Contributor

@MartinForReal MartinForReal commented Sep 29, 2024 •
edited
Loading

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Track2 sdk:migrate nsg client to track2 one

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

The apiVersion of network security group is bumped to 2024-01-01
The apiVersion of VirtualNetworkLink is bumped to 2020-06-01
The apiVersion of PrivateZone is bumped to 2020-06-01

Additional documentation e.g., KEPs (Kubernetes Enhancement Proposals), usage docs, etc.:

@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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Sep 29, 2024
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Sep 29, 2024
@coveralls
Copy link

Coverage Status

coverage: 76.737% (-0.1%) from 76.885%
when pulling 32cc966 on MartinForReal:shafan/sg
into ffcf976 on kubernetes-sigs:master.

@MartinForReal
migrate nsg client to track2 one
c2d6203 
Signed-off-by: Fan Shang Xiang <shafan@microsoft.com>
zarvd
zarvd approved these changes Sep 29, 2024
View reviewed changes
Copy link
Contributor

@zarvd zarvd left a comment

Choose a reason for hiding this comment

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

LGTM

feiskyer
feiskyer approved these changes Sep 30, 2024
View reviewed changes
Copy link
Member

@feiskyer feiskyer left a comment

Choose a reason for hiding this comment

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

lgtm

thanks for the migration

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, 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 [MartinForReal,feiskyer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@feiskyer
Copy link
Member

/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 30, 2024
@k8s-ci-robot k8s-ci-robot merged commit ed78da9 into kubernetes-sigs:master Sep 30, 2024
18 checks passed
@MartinForReal MartinForReal deleted the shafan/sg branch October 11, 2024 02:29
@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.31

@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.30

@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.29

@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.28

@k8s-infra-cherrypick-robot
Copy link

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

Applying: migrate nsg client to track2 one
Using index info to reconstruct a base tree...
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_mock_vmsets.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_test.go
M	pkg/provider/azure_utils.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_mock_vmsets.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.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 nsg client to track2 one

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: #7155 failed to apply on top of branch "release-1.30":

Applying: migrate nsg client to track2 one
Using index info to reconstruct a base tree...
M	internal/testutil/fixture/azure_securitygroup.go
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_accesscontrol_test.go
M	pkg/provider/azure_securitygroup_repo.go
M	pkg/provider/azure_securitygroup_repo_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_storageaccount_test.go
M	pkg/provider/azure_test.go
M	pkg/provider/azure_utils.go
M	pkg/provider/azure_utils_test.go
M	pkg/provider/loadbalancer/accesscontrol.go
M	pkg/provider/loadbalancer/securitygroup/securitygroup.go
M	pkg/provider/loadbalancer/securitygroup/securitygroup_test.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/loadbalancer/securitygroup/securitygroup_test.go
Auto-merging pkg/provider/loadbalancer/securitygroup/securitygroup.go
Auto-merging pkg/provider/loadbalancer/accesscontrol.go
Auto-merging pkg/provider/azure_utils_test.go
Auto-merging pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_storageaccount_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_securitygroup_repo_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo_test.go
Auto-merging pkg/provider/azure_securitygroup_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo.go
Auto-merging pkg/provider/azure_loadbalancer_accesscontrol_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.go
Auto-merging internal/testutil/fixture/azure_securitygroup.go
CONFLICT (content): Merge conflict in internal/testutil/fixture/azure_securitygroup.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 nsg client to track2 one

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

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

Applying: migrate nsg client to track2 one
Using index info to reconstruct a base tree...
M	internal/testutil/fixture/azure_securitygroup.go
M	pkg/provider/azure_loadbalancer.go
M	pkg/provider/azure_loadbalancer_accesscontrol_test.go
M	pkg/provider/azure_mock_vmsets.go
M	pkg/provider/azure_securitygroup_repo.go
M	pkg/provider/azure_securitygroup_repo_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_storageaccount_test.go
M	pkg/provider/azure_test.go
M	pkg/provider/azure_utils.go
M	pkg/provider/azure_utils_test.go
M	pkg/provider/loadbalancer/accesscontrol.go
M	pkg/provider/loadbalancer/securitygroup/securitygroup.go
M	pkg/provider/loadbalancer/securitygroup/securitygroup_test.go
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
Auto-merging pkg/provider/loadbalancer/securitygroup/securitygroup_test.go
Auto-merging pkg/provider/loadbalancer/securitygroup/securitygroup.go
Auto-merging pkg/provider/loadbalancer/accesscontrol.go
Auto-merging pkg/provider/azure_utils_test.go
Auto-merging pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_storageaccount_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_storageaccount_test.go
Auto-merging pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_securitygroup_repo_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo_test.go
Auto-merging pkg/provider/azure_securitygroup_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo.go
Auto-merging pkg/provider/azure_mock_vmsets.go
Auto-merging pkg/provider/azure_loadbalancer_accesscontrol_test.go
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.go
Auto-merging internal/testutil/fixture/azure_securitygroup.go
CONFLICT (content): Merge conflict in internal/testutil/fixture/azure_securitygroup.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 nsg client to track2 one

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

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

Applying: migrate nsg client to track2 one
Using index info to reconstruct a base tree...
A	internal/testutil/assert.go
A	internal/testutil/fixture/azure_securitygroup.go
M	pkg/provider/azure_fakes.go
M	pkg/provider/azure_loadbalancer.go
A	pkg/provider/azure_loadbalancer_accesscontrol.go
A	pkg/provider/azure_loadbalancer_accesscontrol_test.go
M	pkg/provider/azure_mock_vmsets.go
M	pkg/provider/azure_securitygroup_repo.go
M	pkg/provider/azure_securitygroup_repo_test.go
M	pkg/provider/azure_standard.go
M	pkg/provider/azure_standard_test.go
M	pkg/provider/azure_storageaccount_test.go
M	pkg/provider/azure_test.go
M	pkg/provider/azure_utils.go
M	pkg/provider/azure_utils_test.go
M	pkg/provider/loadbalancer/accesscontrol.go
M	pkg/provider/loadbalancer/accesscontrol_test.go
A	pkg/provider/loadbalancer/securitygroup/securitygroup.go
A	pkg/provider/loadbalancer/securitygroup/securitygroup_test.go
A	pkg/provider/loadbalancer/securitygroup/securityrule.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
CONFLICT (modify/delete): pkg/provider/loadbalancer/securitygroup/securityrule.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of pkg/provider/loadbalancer/securitygroup/securityrule.go left in tree.
CONFLICT (modify/delete): pkg/provider/loadbalancer/securitygroup/securitygroup_test.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of pkg/provider/loadbalancer/securitygroup/securitygroup_test.go left in tree.
CONFLICT (modify/delete): pkg/provider/loadbalancer/securitygroup/securitygroup.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of pkg/provider/loadbalancer/securitygroup/securitygroup.go left in tree.
Auto-merging pkg/provider/loadbalancer/accesscontrol_test.go
CONFLICT (content): Merge conflict in pkg/provider/loadbalancer/accesscontrol_test.go
Auto-merging pkg/provider/loadbalancer/accesscontrol.go
CONFLICT (content): Merge conflict in pkg/provider/loadbalancer/accesscontrol.go
Auto-merging pkg/provider/azure_utils_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils_test.go
Auto-merging pkg/provider/azure_utils.go
CONFLICT (content): Merge conflict in pkg/provider/azure_utils.go
Auto-merging pkg/provider/azure_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_test.go
Auto-merging pkg/provider/azure_storageaccount_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_storageaccount_test.go
Auto-merging pkg/provider/azure_standard_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_standard_test.go
Auto-merging pkg/provider/azure_standard.go
Auto-merging pkg/provider/azure_securitygroup_repo_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo_test.go
Auto-merging pkg/provider/azure_securitygroup_repo.go
CONFLICT (content): Merge conflict in pkg/provider/azure_securitygroup_repo.go
Auto-merging pkg/provider/azure_mock_vmsets.go
CONFLICT (modify/delete): pkg/provider/azure_loadbalancer_accesscontrol_test.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of pkg/provider/azure_loadbalancer_accesscontrol_test.go left in tree.
CONFLICT (modify/delete): pkg/provider/azure_loadbalancer_accesscontrol.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of pkg/provider/azure_loadbalancer_accesscontrol.go left in tree.
Auto-merging pkg/provider/azure_loadbalancer.go
CONFLICT (content): Merge conflict in pkg/provider/azure_loadbalancer.go
Auto-merging pkg/provider/azure_fakes.go
CONFLICT (content): Merge conflict in pkg/provider/azure_fakes.go
CONFLICT (modify/delete): internal/testutil/fixture/azure_securitygroup.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of internal/testutil/fixture/azure_securitygroup.go left in tree.
CONFLICT (modify/delete): internal/testutil/assert.go deleted in HEAD and modified in migrate nsg client to track2 one. Version migrate nsg client to track2 one of internal/testutil/assert.go left in tree.
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 nsg client to track2 one

In response to this:

/cherrypick release-1.28

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

@feiskyer feiskyer feiskyer approved these changes

@zarvd zarvd zarvd approved these changes

@andyzhangx andyzhangx Awaiting requested review from andyzhangx

@nilo19 nilo19 Awaiting requested review from nilo19

Assignees

@feiskyer feiskyer

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/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. 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/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.
6 participants
@MartinForReal @coveralls @k8s-ci-robot @feiskyer @k8s-infra-cherrypick-robot @zarvd