Skip to content

Annotations and conditions added to the machines during InPlace update #1271

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
+37 −11
Open

Annotations and conditions added to the machines during InPlace update #1271

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 37 additions & 11 deletions internal/controller/controlplane/k0s_controlplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import (
"errors"
"fmt"
"reflect"
"sigs.k8s.io/controller-runtime/pkg/controller"
"strings"
"time"

Expand All @@ -42,16 +41,19 @@ import (
"k8s.io/utils/ptr"
clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
kubeadmbootstrapv1 "sigs.k8s.io/cluster-api/bootstrap/kubeadm/api/v1beta1"
runtime "sigs.k8s.io/cluster-api/exp/runtime/api/v1alpha1"
capiutil "sigs.k8s.io/cluster-api/util"
"sigs.k8s.io/cluster-api/util/annotations"
"sigs.k8s.io/cluster-api/util/certs"
"sigs.k8s.io/cluster-api/util/collections"
"sigs.k8s.io/cluster-api/util/conditions"
"sigs.k8s.io/cluster-api/util/failuredomains"
"sigs.k8s.io/cluster-api/util/kubeconfig"
"sigs.k8s.io/cluster-api/util/patch"
"sigs.k8s.io/cluster-api/util/secret"
ctrl "sigs.k8s.io/controller-runtime"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/controller"
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"sigs.k8s.io/controller-runtime/pkg/log"

Expand Down Expand Up @@ -444,16 +446,7 @@ func (c *K0sController) reconcileMachines(ctx context.Context, cluster *clusterv

if clusterIsUpdating {
log.Log.Info("Cluster is updating", "currentVersion", currentVersion, "newVersion", kcp.Spec.Version, "strategy", kcp.Spec.UpdateStrategy)
if kcp.Spec.UpdateStrategy == cpv1beta1.UpdateRecreate {
// If the cluster is running in single mode, we can't use the Recreate strategy
if kcp.Spec.K0sConfigSpec.Args != nil {
for _, arg := range kcp.Spec.K0sConfigSpec.Args {
if arg == "--single" {
return fmt.Errorf("UpdateRecreate strategy is not allowed when the cluster is running in single mode")
}
}
}
} else {
if kcp.Spec.UpdateStrategy == cpv1beta1.UpdateInPlace {
kubeClient, err := c.getKubeClient(ctx, cluster)
if err != nil {
return fmt.Errorf("error getting cluster client set for machine update: %w", err)
Expand All @@ -463,6 +456,22 @@ func (c *K0sController) reconcileMachines(ctx context.Context, cluster *clusterv
if err != nil {
return fmt.Errorf("error creating autopilot plan: %w", err)
}

for _, m := range desiredMachines {
err = c.markMachineForExternalUpdate(ctx, kcp, m)
if err != nil {
return fmt.Errorf("error marking machine %s for external update: %w", m.Name, err)
}
}
} else {
// If the cluster is running in single mode, we can't use the Recreate strategy
if kcp.Spec.K0sConfigSpec.Args != nil {
for _, arg := range kcp.Spec.K0sConfigSpec.Args {
if arg == "--single" {
return fmt.Errorf("Recreate and RecreateDeleteFirst strategies are not allowed when the cluster is running in single mode")
}
}
}
}
}

Expand Down Expand Up @@ -559,13 +568,30 @@ func (c *K0sController) inplaceSyncMachineValues(ctx context.Context, kcp *cpv1b
return err
}

if versionMatches(machine, kcp.Spec.Version) {
delete(machine.Annotations, runtime.PendingHooksAnnotation)
conditions.MarkTrue(machine, "UpToDate")
}

machine.Spec.NodeDrainTimeout = kcp.Spec.MachineTemplate.NodeDrainTimeout
machine.Spec.NodeDeletionTimeout = kcp.Spec.MachineTemplate.NodeDeletionTimeout
machine.Spec.NodeVolumeDetachTimeout = kcp.Spec.MachineTemplate.NodeVolumeDetachTimeout

return patchHelper.Patch(ctx, machine)
}

func (c *K0sController) markMachineForExternalUpdate(ctx context.Context, _ *cpv1beta1.K0sControlPlane, machine *clusterv1.Machine) error {
patchHelper, err := patch.NewHelper(machine, c.Client)
if err != nil {
return err
}

annotations.AddAnnotations(machine, map[string]string{runtime.PendingHooksAnnotation: "ExternalUpdate"})
conditions.MarkFalse(machine, "UpToDate", "Waiting for update", clusterv1.ConditionSeverityInfo, "Machine marked for external update")

return patchHelper.Patch(ctx, machine)
}

func (c *K0sController) runMachineDeletionSequence(ctx context.Context, cluster *clusterv1.Cluster, kcp *cpv1beta1.K0sControlPlane, machine *clusterv1.Machine) error {
if err := c.deleteMachine(ctx, machine.Name, kcp); err != nil {
return fmt.Errorf("error deleting machine from template: %w", err)
Expand Down
Loading