Add missing K0sControlPlane status fields and refactor status calc #774
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
from
339f840 to
c919732
Compare
`K0sControlPlane` was missing some required status fields relating to replicas. https://cluster-api.sigs.k8s.io/developer/providers/control-plane?search=pause#required-status-fields-for-implementations-using-replicas While this doesn't really break anything when using this in "standalone" fashion, e.g. without ClusterClass, things go south when using with ClusterClass. What happens is that when the CAPI topology controller does not see the expected fields, it'll determine that the CP is still scaling up and hence prevents users from upgrading CP via CC. Previously we dropped the k0s version suffix from the Machines, in this PR we change it to always include the suffix if given in the CP version. This is to allow e.g. `v1.30.0+k0s.0` --> `v1.30.0+k0s.1` type upgrades. Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
from
c919732 to
8185eb8
Compare
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
6 times, most recently
from
1852ad8 to
9061408
Compare
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
from
9061408 to
e6f0774
Compare
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
… ones This ensures etcd can actually catch up on new nodes before we terminate old ones. Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
…ndling; Increase the timeout a bit Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
… have obsolete status data because of caches and potential status update errors Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
….status.version Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
apedriza
reviewed
Oct 17, 2024
internal/controller/controlplane/k0s_controlplane_controller.go
Outdated
Show resolved
Hide resolved
Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
|
Thanks @apedriza , pushed the suggested changes |
makhov
reviewed
Oct 18, 2024
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
from
817ea7d to
eaf9985
Compare
makhov
reviewed
Oct 21, 2024
…ut --enable-worker When running without --enable-worker, the machines never transition into Running state as there's no related Node objects in the child API. Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
jnummelin
force-pushed
the
fix/k0scontrolplane-status-replicas
branch
from
eaf9985 to
a4f18bf
Compare
…er enabled for CP Signed-off-by: Jussi Nummelin <jnummelin@mirantis.com>
makhov
approved these changes
Oct 22, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
K0sControlPlanewas missing some required status fields relating to replicas. https://cluster-api.sigs.k8s.io/developer/providers/control-plane?search=pause#required-status-fields-for-implementations-using-replicasWhile this doesn't really break anything when using this in "standalone" fashion, e.g. without ClusterClass, things go south when using with ClusterClass. What happens is that when the CAPI topology controller does not see the expected fields, it'll determine that the CP is still scaling up and hence prevents users from upgrading CP via CC.
Previously we dropped the k0s version suffix from the Machines, in this PR we change it to always include the suffix if given in the CP version. This is to allow e.g.
v1.30.0+k0s.0-->v1.30.0+k0s.1type upgrades.