🐛 bugfix function aggregateFromMachinesToKCP

[wm775825]

What this PR does / why we need it:

When aggregating from machine conditions to kcp condition, the priority is:

• false conditions with error reason
• false conditions with warning reason
• false conditions with info reason
• true conditions
• unknown conditions

However, when dealing with "false conditions with info conditions", there is a bug in source codes.

In Line 562, having checked warning reasons, we should check info reasons next. That is, to check "kcpMachinesWithInfo" rather than "kcpMachinesWithWarnings". However, there is a duplicate "kcpMachinesWithWarnings" in line 556 and line 662.

Maybe this is not a common scene, so it didn't lead to serious problems and was neglected.

As a beginner of cluster-api, i found it when i read source codes, so i fix it.

Which issue(s) this PR fixes (optional, in fixes #<issue number>(, fixes #<issue_number>, ...) format, will close the issue(s) when PR gets merged):
Fixes #

no issues.

[linux-foundation-easycla]

The committers listed above are authorized under a signed CLA.

• ✅ login: wm775825 / name: faxii (61082f2)

[k8s-ci-robot]

Welcome @wm775825!

It looks like this is your first PR to kubernetes-sigs/cluster-api 🎉. Please refer to our pull request process documentation to help your PR have a smooth ride to approval.

You will be prompted by a bot to use commands during the review process. Do not be afraid to follow the prompts! It is okay to experiment. Here is the bot commands documentation.

You can also check if kubernetes-sigs/cluster-api has its own contribution guidelines.

You may want to refer to our testing guide if you run into trouble with your tests not passing.

If you are having difficulty getting your pull request seen, please follow the recommended escalation practices. Also, for tips and tricks in the contribution process you may want to read the Kubernetes contributor cheat sheet. We want to make sure your contribution gets all the attention it needs!

Thank you, and welcome to Kubernetes. 😃

[k8s-ci-robot]

Hi @wm775825. Thanks for your PR.

I'm waiting for a kubernetes-sigs member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

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.

[wm775825]

/test pull-cluster-api-build-main

[k8s-ci-robot]

@wm775825: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-cluster-api-build-main

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.

[oscr]

/ok-to-test

[wm775825]

/test pull-cluster-api-build-main

[wm775825]

/test all

[oscr]

/retest

[wm775825]

/lint

[wm775825]

/help

[wm775825]

how to invoke lint? anyone can help?

[killianmuldoon]

/ok-to-test

(Not sure why lint isn't running) 🤔

[oscr]

In the warning it says: "This workflow requires approval from a maintainer." So I assume I'm not allowed to trigger it for none Kubernetes org members.

[sbueringer]

It cannot be done via ok-to-test (I think there is a long-standing issue for that in test-infra)

Someone with at least write access to the repo has to push a button

[wm775825]

/cc

[k8s-ci-robot]

@wm775825: GitHub didn't allow me to request PR reviews from the following users: wm775825.

Note that only kubernetes-sigs members and repo collaborators can review this PR, and authors cannot review their own PRs.

In response to this:

/cc

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.

[wm775825]

/auto-cc

[g-gaston]

The fix looks good, thanks for finding this!
Could we add a unit test to make sure this doesn't break again?

[wm775825]

/auto-cc

[wm775825]

sorry, it seems that i removed some reviewers by mistake?

[jackfrancis]

/lgtm

[k8s-ci-robot]

LGTM label has been added.

Git tree hash: 0f1f7187a178a18f32097223141cad6de83ee811

[g-gaston]

/lgtm
thanks a lot!

[sbueringer]

@jackfrancis I'll try to take a look soon'ish. If it's a bugfix and pretty safe would be good to cherry-pick in both

[sbueringer]

Thank you very much!!

/lgtm
/approve

[sbueringer]

/cherry-pick release-1.3

[k8s-ci-robot]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sbueringer

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:

• OWNERS [sbueringer]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.3

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.

[sbueringer]

/cherry-pick release-1.2

[k8s-infra-cherrypick-robot]

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

In response to this:

/cherry-pick release-1.2

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]

@sbueringer: #8132 failed to apply on top of branch "release-1.3":

Applying: bugfix function aggregateFromMachinesToKCP
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/internal/workload_cluster_conditions.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/internal/workload_cluster_conditions.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/workload_cluster_conditions.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 bugfix function aggregateFromMachinesToKCP
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:

/cherry-pick release-1.3

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]

@sbueringer: #8132 failed to apply on top of branch "release-1.2":

Applying: bugfix function aggregateFromMachinesToKCP
Using index info to reconstruct a base tree...
M	controlplane/kubeadm/internal/workload_cluster_conditions.go
Falling back to patching base and 3-way merge...
Auto-merging controlplane/kubeadm/internal/workload_cluster_conditions.go
CONFLICT (content): Merge conflict in controlplane/kubeadm/internal/workload_cluster_conditions.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 bugfix function aggregateFromMachinesToKCP
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:

/cherry-pick release-1.2

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.

[sbueringer]

@wm775825 Do you have time to open (manual) cherry-pick PRs for release-1.3 and release-1.2?

[wm775825]

it seems there has been two manual cherrypicks merged.

[jackfrancis]

@wm775825 I went ahead and took the liberty, thanks again for doing all the real work here :) 💪