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

[release-1.23] fix: panic when controller does not have cloud config #1251

Conversation

k8s-infra-cherrypick-robot

This is an automated cherry-pick of #1250

/assign andyzhangx

fix: panic when controller does not have cloud config

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 19, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: k8s-infra-cherrypick-robot
Once this PR has been reviewed and has the lgtm label, please assign feiskyer for approval. For more information see the Kubernetes Code Review Process.

The full list of commands accepted by this bot can be found 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

@andyzhangx andyzhangx merged commit 7e7b997 into kubernetes-sigs:release-1.23 Feb 19, 2024
20 of 21 checks passed
@andyzhangx
Copy link
Member

/cherrypick release-1.22

@k8s-infra-cherrypick-robot
Copy link
Author

@andyzhangx: #1251 failed to apply on top of branch "release-1.22":

Applying: fix: panic when controller does not have cloud config
Using index info to reconstruct a base tree...
M	pkg/blob/azure.go
M	pkg/blob/azure_test.go
M	pkg/blob/controllerserver.go
M	pkg/blob/nodeserver.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/blob/nodeserver.go
Auto-merging pkg/blob/controllerserver.go
Auto-merging pkg/blob/azure_test.go
CONFLICT (content): Merge conflict in pkg/blob/azure_test.go
Auto-merging pkg/blob/azure.go
CONFLICT (content): Merge conflict in pkg/blob/azure.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 fix: panic when controller does not have cloud config
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherrypick release-1.22

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/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants