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

Chores: refactor config in azure struct and add retry config in track2 client #7533

Merged
merged 1 commit into from
Nov 12, 2024
Merged

Chores: refactor config in azure struct and add retry config in track2 client #7533

merged 1 commit into from
Nov 12, 2024

Conversation

MartinForReal
Copy link
Contributor

What type of PR is this?

/kind cleanup

What this PR does / why we need it:

Chores: refactor config in azure struct and add retry config in track2 client

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 kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt. release-note-none Denotes a PR that doesn't merit a release note. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Nov 11, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: MartinForReal

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 approved Indicates a PR has been approved by an approver from all required OWNERS files. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Nov 11, 2024
@MartinForReal
Copy link
Contributor Author

/retest

1 similar comment
@MartinForReal
Copy link
Contributor Author

/retest

@nilo19
Copy link
Contributor

nilo19 commented Nov 12, 2024

/lgtm

@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
feiskyer
feiskyer reviewed Nov 12, 2024
View reviewed changes
pkg/provider/azure.go
// because the routes are not taken effect when the async route updating operation returns success. Default is 30 seconds.
RouteUpdateWaitingInSeconds int `json:"routeUpdateWaitingInSeconds,omitempty" yaml:"routeUpdateWaitingInSeconds,omitempty"`
// The user agent for Azure customer usage attribution
UserAgent string `json:"userAgent,omitempty" yaml:"userAgent,omitempty"`
Copy link
Member

Choose a reason for hiding this comment

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

where is userAgent be moved to?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

It is in armcon

@MartinForReal
Copy link
Contributor Author

/retest

1 similar comment
@MartinForReal
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit cddf3dd into kubernetes-sigs:master Nov 12, 2024
18 checks passed
@MartinForReal MartinForReal deleted the shafan/configrefactor branch November 13, 2024 16:10
@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.31

@MartinForReal
Copy link
Contributor Author

/cherrypick release-1.30

@k8s-infra-cherrypick-robot
Copy link

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

Applying: refactory config in azure
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/provider/azure.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/availabilitysetclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/availabilitysetclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory_gen.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/interfaceclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/interfaceclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/loadbalancerclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/loadbalancerclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatelinkserviceclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatelinkserviceclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatezoneclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatezoneclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/publicipaddressclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/publicipaddressclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/routetableclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/routetableclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/securitygroupclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/securitygroupclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/snapshotclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/snapshotclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/subnetclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/subnetclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils/const.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient/zz_generated_client.goerror: patch failed: vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/Makefile:72
error: vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/Makefile: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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"

M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient/zz_generated_client.go
Patch failed at 0001 refactory config in azure

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

Applying: refactory config in azure
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	pkg/provider/azure.go
M	pkg/provider/azure_test.go
M	pkg/provider/config/azure_auth.go
M	pkg/provider/config/azure_auth_test.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/accountclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/availabilitysetclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/availabilitysetclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobcontainerclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/blobservicepropertiesclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/diskclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/factory_gen.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/interfaceclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/interfaceclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/loadbalancerclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/loadbalancerclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatelinkserviceclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatelinkserviceclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatezoneclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/privatezoneclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/publicipaddressclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/publicipaddressclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/routetableclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/routetableclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/securitygroupclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/securitygroupclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/snapshotclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/snapshotclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/subnetclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/subnetclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/utils/const.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachineclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient/interface.goerror: patch failed: vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/Makefile:72
error: vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/Makefile: patch does not apply
error: Did you hand edit your patch?
It does not apply to blobs recorded in its index.
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"

M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetclient/zz_generated_client.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient/interface.go
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/virtualmachinescalesetvmclient/zz_generated_client.go
Patch failed at 0001 refactory config in azure

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.

This was referenced Nov 26, 2024
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@feiskyer feiskyer feiskyer left review comments

@jwtty jwtty Awaiting requested review from jwtty

@lzhecheng lzhecheng Awaiting requested review from lzhecheng

Assignees

@nilo19 nilo19

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-none Denotes a PR that doesn't merit a release note. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@MartinForReal @k8s-ci-robot @nilo19 @k8s-infra-cherrypick-robot @feiskyer