Skip to content

chore: configure timeouts for HTTP/2 in azclient #2382

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

Merged
merged 1 commit into from
Feb 17, 2025
Merged

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind feature

What this PR does / why we need it:
chore: configure timeouts for HTTP/2 in azclient

refer to kubernetes-sigs/cloud-provider-azure#8352

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

none

@k8s-ci-robot k8s-ci-robot added kind/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Feb 17, 2025
@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 requested review from cvvz and gnufied February 17, 2025 06:27
@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 Feb 17, 2025
@k8s-ci-robot
Copy link
Contributor

@andyzhangx: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-azurefile-csi-driver-e2e-capz bdf0084 link true /test pull-azurefile-csi-driver-e2e-capz

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@andyzhangx andyzhangx merged commit a060c21 into master Feb 17, 2025
27 of 29 checks passed
@andyzhangx
Copy link
Member Author

/cherrypick release-1.31

@andyzhangx
Copy link
Member Author

/cherrypick release-1.30

@k8s-infra-cherrypick-robot

@andyzhangx: #2382 failed to apply on top of branch "release-1.31":

Applying: chore: configure timeouts for HTTP/2 in azclient
.git/rebase-apply/patch:1238: trailing whitespace.
additionalDirectories: 
.git/rebase-apply/patch:315: new blank line at EOF.
+
.git/rebase-apply/patch:325: new blank line at EOF.
+
.git/rebase-apply/patch:403: new blank line at EOF.
+
warning: 4 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
A	vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go
A	vendor/github.com/antlr4-go/antlr/v4/atn.go
A	vendor/github.com/antlr4-go/antlr/v4/atn_config.go
A	vendor/github.com/antlr4-go/antlr/v4/input_stream.go
A	vendor/github.com/antlr4-go/antlr/v4/jcollect.go
A	vendor/github.com/antlr4-go/antlr/v4/lexer.go
A	vendor/github.com/antlr4-go/antlr/v4/ll1_analyzer.go
A	vendor/github.com/antlr4-go/antlr/v4/parser_atn_simulator.go
A	vendor/github.com/antlr4-go/antlr/v4/prediction_context.go
A	vendor/github.com/antlr4-go/antlr/v4/recognizer.go
A	vendor/github.com/antlr4-go/antlr/v4/statistics.go
A	vendor/github.com/antlr4-go/antlr/v4/token.go
A	vendor/github.com/antlr4-go/antlr/v4/utils.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
Removing vendor/golang.org/x/exp/slices/zsortordered.go
Removing vendor/golang.org/x/exp/slices/zsortanyfunc.go
Removing vendor/golang.org/x/exp/slices/cmp.go
Removing vendor/golang.org/x/exp/constraints/constraints.go
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/statistics.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/statistics.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/prediction_context.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/prediction_context.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/jcollect.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/jcollect.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/input_stream.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/input_stream.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/atn_config.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/atn_config.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go left in tree.
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/utils.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/utils.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/recognizer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn.go
Removing vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/autorest.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
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 chore: configure timeouts for HTTP/2 in azclient

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

@andyzhangx: #2382 failed to apply on top of branch "release-1.30":

Applying: chore: configure timeouts for HTTP/2 in azclient
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/README.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_cli_credential.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/ci.yml
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/custom_client.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/version.go
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/CHANGELOG.md
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/challenge_policy.go
A	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/ci.keyvault.yml
M	vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/constants.go
M	vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential/confidential.go
M	vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/base.go
M	vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local/server.go
M	vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/oauth.go
M	vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/comm.go
A	vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go
A	vendor/github.com/antlr4-go/antlr/v4/atn.go
A	vendor/github.com/antlr4-go/antlr/v4/atn_config.go
A	vendor/github.com/antlr4-go/antlr/v4/input_stream.go
A	vendor/github.com/antlr4-go/antlr/v4/jcollect.go
A	vendor/github.com/antlr4-go/antlr/v4/lexer.go
A	vendor/github.com/antlr4-go/antlr/v4/ll1_analyzer.go
A	vendor/github.com/antlr4-go/antlr/v4/parser_atn_simulator.go
A	vendor/github.com/antlr4-go/antlr/v4/prediction_context.go
A	vendor/github.com/antlr4-go/antlr/v4/recognizer.go.git/rebase-apply/patch:1238: trailing whitespace.
additionalDirectories: 
.git/rebase-apply/patch:315: new blank line at EOF.
+
.git/rebase-apply/patch:325: new blank line at EOF.
+
.git/rebase-apply/patch:403: new blank line at EOF.
+
warning: 4 lines add whitespace errors.

A	vendor/github.com/antlr4-go/antlr/v4/statistics.go
A	vendor/github.com/antlr4-go/antlr/v4/token.go
A	vendor/github.com/antlr4-go/antlr/v4/utils.go
M	vendor/golang.org/x/time/rate/rate.go
M	vendor/golang.org/x/tools/go/ast/inspector/inspector.go
A	vendor/golang.org/x/tools/go/ast/inspector/iter.go
M	vendor/modules.txt
M	vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go
Falling back to patching base and 3-way merge...
Auto-merging vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go
CONFLICT (content): Merge conflict in vendor/sigs.k8s.io/cloud-provider-azure/pkg/azclient/auth.go
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
CONFLICT (modify/delete): vendor/golang.org/x/tools/go/ast/inspector/iter.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/golang.org/x/tools/go/ast/inspector/iter.go left in tree.
Auto-merging vendor/golang.org/x/tools/go/ast/inspector/inspector.go
Auto-merging vendor/golang.org/x/time/rate/rate.go
Removing vendor/golang.org/x/exp/slices/zsortordered.go
Removing vendor/golang.org/x/exp/slices/zsortanyfunc.go
Removing vendor/golang.org/x/exp/slices/cmp.go
Removing vendor/golang.org/x/exp/constraints/constraints.go
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/statistics.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/statistics.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/prediction_context.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/prediction_context.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/jcollect.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/jcollect.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/input_stream.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/input_stream.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/atn_config.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/atn_config.go left in tree.
CONFLICT (modify/delete): vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go deleted in HEAD and modified in chore: configure timeouts for HTTP/2 in azclient. Version chore: configure timeouts for HTTP/2 in azclient of vendor/github.com/antlr4-go/antlr/v4/antlrdoc.go left in tree.
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/utils.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/utils.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/token.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/recognizer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/parser_atn_simulator.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/ll1_analyzer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
CONFLICT (content): Merge conflict in vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/lexer.go
Auto-merging vendor/github.com/antlr/antlr4/runtime/Go/antlr/v4/atn.go
Auto-merging vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/ops/internal/comm/comm.go
Auto-merging vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/oauth/oauth.go
Auto-merging vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/local/server.go
Auto-merging vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/internal/base/base.go
Auto-merging vendor/github.com/AzureAD/microsoft-authentication-library-for-go/apps/confidential/confidential.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/constants.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/constants.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/ci.securitykeyvault.yml
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/challenge_policy.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/challenge_policy.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal/CHANGELOG.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/version.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/version.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/custom_client.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/ci.yml
Removing vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/autorest.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azsecrets/CHANGELOG.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/version.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/azure_cli_credential.go
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/README.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/README.md
Auto-merging vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/CHANGELOG.md
CONFLICT (content): Merge conflict in vendor/github.com/Azure/azure-sdk-for-go/sdk/azidentity/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
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 chore: configure timeouts for HTTP/2 in azclient

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
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. 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.

3 participants