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.

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

fix: disable UseInstanceMetadata in controller #2400

Merged
merged 1 commit into from
Mar 1, 2025

Conversation

andyzhangx
Copy link
Member

What type of PR is this?
/kind bug

What this PR does / why we need it:
fix: disable UseInstanceMetadata in controller
This PR fixes the bug introduced in track2 adoption refactoring

Which issue(s) this PR fixes:

Fixes #

Requirements:

Special notes for your reviewer:

Release note:

fix: disable UseInstanceMetadata in controller

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Mar 1, 2025
@k8s-ci-robot k8s-ci-robot requested a review from cvvz March 1, 2025 02:17
@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 a review from ZeroMagic March 1, 2025 02:17
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Mar 1, 2025
@andyzhangx
Copy link
Member Author

/retest

1 similar comment
@andyzhangx
Copy link
Member Author

/retest

@andyzhangx andyzhangx merged commit 8df117b into master Mar 1, 2025
28 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: #2400 failed to apply on top of branch "release-1.31":

Applying: fix: disable UseInstanceMetadata in controller
Using index info to reconstruct a base tree...
M	pkg/azurefile/azure.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/azure.go
CONFLICT (content): Merge conflict in pkg/azurefile/azure.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 fix: disable UseInstanceMetadata in controller

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

Applying: fix: disable UseInstanceMetadata in controller
Using index info to reconstruct a base tree...
M	pkg/azurefile/azure.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/azurefile/azure.go
CONFLICT (content): Merge conflict in pkg/azurefile/azure.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 fix: disable UseInstanceMetadata in controller

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/bug Categorizes issue or PR as related to a bug. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants