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

Skip unmanaged Nodes for instancesV2 #4294

Merged

Conversation

lzhecheng
Copy link
Contributor

What type of PR is this?

/kind feature

What this PR does / why we need it:

Skip unmanaged Nodes for instancesV2

Which issue(s) this PR fixes:

Fixes #

Special notes for your reviewer:

Does this PR introduce a user-facing change?

Skip unmanaged Nodes for instancesV2

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


Signed-off-by: Zhecheng Li <zhechengli@microsoft.com>
@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/feature Categorizes issue or PR as related to a new feature. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jul 17, 2023
@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 17, 2023
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.

thanks for the fix

/lgtm
/approve

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: feiskyer, lzhecheng

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 the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jul 17, 2023
@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.27

@k8s-infra-cherrypick-robot

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.27 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.27

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.

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.26

@k8s-infra-cherrypick-robot

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.26 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.26

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.

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.25

@k8s-infra-cherrypick-robot

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.25 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.25

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.

@lzhecheng
Copy link
Contributor Author

/cherrypick release-1.24

@k8s-infra-cherrypick-robot

@lzhecheng: once the present PR merges, I will cherry-pick it on top of release-1.24 in a new PR and assign it to you.

In response to this:

/cherrypick release-1.24

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.

@feiskyer
Copy link
Member

/retest

1 similar comment
@lzhecheng
Copy link
Contributor Author

/retest

@k8s-ci-robot k8s-ci-robot merged commit f46488d into kubernetes-sigs:master Jul 17, 2023
16 checks passed
@k8s-infra-cherrypick-robot

@lzhecheng: new pull request created: #4296

In response to this:

/cherrypick release-1.27

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #4294 failed to apply on top of branch "release-1.26":

Applying: Skip unmanaged Nodes for instancesV2
Using index info to reconstruct a base tree...
M	pkg/provider/azure_instances.go
M	pkg/provider/azure_instances_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_instances_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_instances_test.go
Auto-merging pkg/provider/azure_instances.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 Skip unmanaged Nodes for instancesV2
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.26

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #4294 failed to apply on top of branch "release-1.25":

Applying: Skip unmanaged Nodes for instancesV2
Using index info to reconstruct a base tree...
M	pkg/provider/azure_instances.go
M	pkg/provider/azure_instances_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_instances_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_instances_test.go
Auto-merging pkg/provider/azure_instances.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 Skip unmanaged Nodes for instancesV2
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.25

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.

@k8s-infra-cherrypick-robot

@lzhecheng: #4294 failed to apply on top of branch "release-1.24":

Applying: Skip unmanaged Nodes for instancesV2
Using index info to reconstruct a base tree...
M	pkg/provider/azure_instances.go
M	pkg/provider/azure_instances_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/provider/azure_instances_test.go
CONFLICT (content): Merge conflict in pkg/provider/azure_instances_test.go
Auto-merging pkg/provider/azure_instances.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 Skip unmanaged Nodes for instancesV2
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.24

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.

@lzhecheng lzhecheng deleted the skip-unmanaged-node-instancesv2 branch July 19, 2023 02:06
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. 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/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants