Fix lint errors

Signed-off-by: Furkat Gofurov <[email protected]>

Author: furkatgofurov7

Makefile

@@ -106,7 +106,7 @@ GOLANGCI_LINT_BIN := golangci-lint
 GOLANGCI_LINT := $(abspath $(TOOLS_BIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER))
 GOLANGCI_LINT_PKG := github.com/golangci/golangci-lint/v2/cmd/golangci-lint
 
-GINKGO_VER := v2.22.2
+GINKGO_VER := v2.23.4
 GINKGO_BIN := ginkgo
 GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINKGO_VER))
 GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo

bootstrap/internal/ignition/ignition_test.go

@@ -21,7 +21,7 @@ import (
 	"compress/gzip"
 	"encoding/base64"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"strings"
 	"testing"
 
@@ -135,7 +135,7 @@ var _ = Describe("NewJoinWorker", func() {
 		reader := bytes.NewReader(scriptContentsGzip)
 		gzreader, err := gzip.NewReader(reader)
 		Expect(err).ToNot(HaveOccurred())
-		scriptContents, err := ioutil.ReadAll(gzreader)
+		scriptContents, err := io.ReadAll(gzreader)
 		Expect(err).ToNot(HaveOccurred())
 		Expect(scriptContents).To(ContainSubstring("/opt/rke2-cis-script.sh"))
 	})

controlplane/internal/contract/types.go

@@ -41,11 +41,13 @@ func (p Path) IsParentOf(other Path) bool {
 	if len(p) >= len(other) {
 		return false
 	}
+
 	for i := range p {
 		if p[i] != other[i] {
 			return false
 		}
 	}
+
 	return true
 }
 
@@ -54,11 +56,13 @@ func (p Path) Equal(other Path) bool {
 	if len(p) != len(other) {
 		return false
 	}
+
 	for i := range p {
 		if p[i] != other[i] {
 			return false
 		}
 	}
+
 	return true
 }
 
@@ -88,9 +92,11 @@ func (i *Int64) Get(obj *unstructured.Unstructured) (*int64, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get %s from object", "."+strings.Join(i.path, "."))
 	}
+
 	if !ok {
 		return nil, errors.Wrapf(ErrFieldNotFound, "path %s", "."+strings.Join(i.path, "."))
 	}
+
 	return &value, nil
 }
 
@@ -99,6 +105,7 @@ func (i *Int64) Set(obj *unstructured.Unstructured, value int64) error {
 	if err := unstructured.SetNestedField(obj.UnstructuredContent(), value, i.path...); err != nil {
 		return errors.Wrapf(err, "failed to set path %s of object %v", "."+strings.Join(i.path, "."), obj.GroupVersionKind())
 	}
+
 	return nil
 }
 
@@ -122,13 +129,22 @@ func (i *Int32) Get(obj *unstructured.Unstructured) (*int32, error) {
 		if err != nil {
 			return nil, errors.Wrapf(err, "failed to get %s from object", "."+strings.Join(path, "."))
 		}
+
 		if !ok {
 			paths = append(paths, "."+strings.Join(path, "."))
+
 			continue
 		}
+
+		if value > 2147483647 || value < -2147483648 {
+			return nil, errors.Wrapf(err, "int32 overflow: %d", value)
+		}
+
 		int32Value := int32(value)
+
 		return &int32Value, nil
 	}
+
 	return nil, errors.Wrapf(ErrFieldNotFound, "path %s", strings.Join(paths, ", "))
 }
 
@@ -140,6 +156,7 @@ func (i *Int32) Set(obj *unstructured.Unstructured, value int64) error {
 	if err := unstructured.SetNestedField(obj.UnstructuredContent(), value, i.paths[0]...); err != nil {
 		return errors.Wrapf(err, "failed to set path %s of object %v", "."+strings.Join(i.paths[0], "."), obj.GroupVersionKind())
 	}
+
 	return nil
 }
 
@@ -159,9 +176,11 @@ func (b *Bool) Get(obj *unstructured.Unstructured) (*bool, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get %s from object", "."+strings.Join(b.path, "."))
 	}
+
 	if !ok {
 		return nil, errors.Wrapf(ErrFieldNotFound, "path %s", "."+strings.Join(b.path, "."))
 	}
+
 	return &value, nil
 }
 
@@ -170,6 +189,7 @@ func (b *Bool) Set(obj *unstructured.Unstructured, value bool) error {
 	if err := unstructured.SetNestedField(obj.UnstructuredContent(), value, b.path...); err != nil {
 		return errors.Wrapf(err, "failed to set path %s of object %v", "."+strings.Join(b.path, "."), obj.GroupVersionKind())
 	}
+
 	return nil
 }
 
@@ -189,9 +209,11 @@ func (s *String) Get(obj *unstructured.Unstructured) (*string, error) {
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get %s from object", "."+strings.Join(s.path, "."))
 	}
+
 	if !ok {
 		return nil, errors.Wrapf(ErrFieldNotFound, "path %s", "."+strings.Join(s.path, "."))
 	}
+
 	return &value, nil
 }
 
@@ -200,6 +222,7 @@ func (s *String) Set(obj *unstructured.Unstructured, value string) error {
 	if err := unstructured.SetNestedField(obj.UnstructuredContent(), value, s.path...); err != nil {
 		return errors.Wrapf(err, "failed to set path %s of object %v", "."+strings.Join(s.path, "."), obj.GroupVersionKind())
 	}
+
 	return nil
 }
 
@@ -219,6 +242,7 @@ func (i *Duration) Get(obj *unstructured.Unstructured) (*metav1.Duration, error)
 	if err != nil {
 		return nil, errors.Wrapf(err, "failed to get %s from object", "."+strings.Join(i.path, "."))
 	}
+
 	if !ok {
 		return nil, errors.Wrapf(ErrFieldNotFound, "path %s", "."+strings.Join(i.path, "."))
 	}
@@ -236,5 +260,6 @@ func (i *Duration) Set(obj *unstructured.Unstructured, value metav1.Duration) er
 	if err := unstructured.SetNestedField(obj.UnstructuredContent(), value.Duration.String(), i.path...); err != nil {
 		return errors.Wrapf(err, "failed to set path %s of object %v", "."+strings.Join(i.path, "."), obj.GroupVersionKind())
 	}
+
 	return nil
 }

controlplane/internal/controllers/rke2controlplane_controller.go

@@ -44,7 +44,6 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/source"
 
-	"github.com/rancher/cluster-api-provider-rke2/controlplane/internal/util/ssa"
 	clusterv1 "sigs.k8s.io/cluster-api/api/v1beta1"
 	"sigs.k8s.io/cluster-api/controllers/clustercache"
 	"sigs.k8s.io/cluster-api/controllers/remote"
@@ -57,6 +56,8 @@ import (
 	"sigs.k8s.io/cluster-api/util/patch"
 
 	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
+	"github.com/rancher/cluster-api-provider-rke2/controlplane/internal/contract"
+	"github.com/rancher/cluster-api-provider-rke2/controlplane/internal/util/ssa"
 	"github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
 	"github.com/rancher/cluster-api-provider-rke2/pkg/registration"
 	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
@@ -65,8 +66,10 @@ import (
 )
 
 const (
+	// rke2ManagerName is the name of the RKE2 manager deployment.
 	rke2ManagerName = "rke2controlplane"
 
+	// rke2ControlPlaneKind is the kind of the RKE2 control plane.
 	rke2ControlPlaneKind = "RKE2ControlPlane"
 
 	// dependentCertRequeueAfter is how long to wait before checking again to see if
@@ -500,6 +503,10 @@ func (r *RKE2ControlPlaneReconciler) reconcileNormal(
 		return result, err
 	}
 
+	if err := r.syncMachines(ctx, rke2.ControlPlane{}); err != nil {
+		return ctrl.Result{}, errors.Wrap(err, "failed to sync Machines")
+	}
+
 	controlPlaneMachines, err := r.managementClusterUncached.GetMachinesForCluster(
 		ctx,
 		util.ObjectKey(cluster),
@@ -1098,3 +1105,86 @@ func (r *RKE2ControlPlaneReconciler) getWorkloadCluster(ctx context.Context, clu
 
 	return workloadCluster, nil
 }
+
+// syncMachines updates Machines, InfrastructureMachines and Rke2Configs to propagate in-place mutable fields from KCP.
+// Note: It also cleans up managed fields of all Machines so that Machines that were
+// created/patched before (< v1.4.0)“ the controller adopted Server-Side-Apply (SSA) can also work with SSA.
+// Note: For InfrastructureMachines and Rke2Configs it also drops ownership of "metadata.labels" and
+// "metadata.annotations" from "manager" so that "rke2controlplane" can own these fields and can work with SSA.
+// Otherwise, fields would be co-owned by our "old" "manager" and "rke2controlplane" and then we would not be
+// able to e.g. drop labels and annotations.
+func (r *RKE2ControlPlaneReconciler) syncMachines(ctx context.Context, controlPlane rke2.ControlPlane) error {
+	patchHelpers := map[string]*patch.Helper{}
+
+	for machineName := range controlPlane.Machines {
+		m := controlPlane.Machines[machineName]
+		// If the machine is already being deleted, we don't need to update it.
+		if !m.DeletionTimestamp.IsZero() {
+			continue
+		}
+
+		// Cleanup managed fields of all Machines.
+		// We do this so that Machines that were created/patched before the controller adopted Server-Side-Apply (SSA)
+		// (< v1.4.0) can also work with SSA. Otherwise, fields would be co-owned by our "old" "manager" and
+		// "rke2controlplane" and then we would not be able to e.g. drop labels and annotations.
+		if err := ssa.CleanUpManagedFieldsForSSAAdoption(ctx, r.Client, m, rke2ManagerName); err != nil {
+			return errors.Wrapf(err, "failed to update Machine: failed to adjust the managedFields of the Machine %s", klog.KObj(m))
+		}
+		// Update Machine to propagate in-place mutable fields from RCP.
+		updatedMachine, err := r.UpdateMachine(ctx, m, controlPlane.RCP, controlPlane.Cluster)
+		if err != nil {
+			return errors.Wrapf(err, "failed to update Machine: %s", klog.KObj(m))
+		}
+
+		controlPlane.Machines[machineName] = updatedMachine
+		// Since the machine is updated, re-create the patch helper so that any subsequent
+		// Patch calls use the correct base machine object to calculate the diffs.
+		// Example: reconcileControlPlaneConditions patches the machine objects in a subsequent call
+		// and, it should use the updated machine to calculate the diff.
+		// Note: If the patchHelpers are not re-computed based on the new updated machines, subsequent
+		// Patch calls will fail because the patch will be calculated based on an outdated machine and will error
+		// because of outdated resourceVersion.
+		patchHelper, err := patch.NewHelper(updatedMachine, r.Client)
+		if err != nil {
+			return errors.Wrapf(err, "failed to create patch helper for Machine %s", klog.KObj(updatedMachine))
+		}
+
+		patchHelpers[machineName] = patchHelper
+
+		labelsAndAnnotationsManagedFieldPaths := []contract.Path{
+			{"f:metadata", "f:annotations"},
+			{"f:metadata", "f:labels"},
+		}
+		infraMachine := controlPlane.InfraResources[machineName]
+		// Cleanup managed fields of all InfrastructureMachines to drop ownership of labels and annotations
+		// from "manager". We do this so that InfrastructureMachines that are created using the Create method
+		// can also work with SSA. Otherwise, labels and annotations would be co-owned by our "old" "manager"
+		// and "rke2-kubeadmcontrolplane" and then we would not be able to e.g. drop labels and annotations.
+		if err := ssa.DropManagedFields(ctx, r.Client, infraMachine, rke2ManagerName, labelsAndAnnotationsManagedFieldPaths); err != nil {
+			return errors.Wrapf(err, "failed to clean up managedFields of InfrastructureMachine %s", klog.KObj(infraMachine))
+		}
+		// Update in-place mutating fields on InfrastructureMachine.
+		if err := r.UpdateExternalObject(ctx, infraMachine, controlPlane.RCP, controlPlane.Cluster); err != nil {
+			return errors.Wrapf(err, "failed to update InfrastructureMachine %s", klog.KObj(infraMachine))
+		}
+
+		rke2Config := controlPlane.Rke2Configs[machineName]
+		// Note: Set the GroupVersionKind because updateExternalObject depends on it.
+		rke2Config.SetGroupVersionKind(m.Spec.Bootstrap.ConfigRef.GroupVersionKind())
+		// Cleanup managed fields of all Rke2Configs to drop ownership of labels and annotations
+		// from "manager". We do this so that Rke2Configs that are created using the Create method
+		// can also work with SSA. Otherwise, labels and annotations would be co-owned by our "old" "manager"
+		// and "rke2controlplane" and then we would not be able to e.g. drop labels and annotations.
+		if err := ssa.DropManagedFields(ctx, r.Client, rke2Config, rke2ManagerName, labelsAndAnnotationsManagedFieldPaths); err != nil {
+			return errors.Wrapf(err, "failed to clean up managedFields of KubeadmConfig %s", klog.KObj(rke2Config))
+		}
+		// Update in-place mutating fields on BootstrapConfig.
+		if err := r.UpdateExternalObject(ctx, rke2Config, controlPlane.RCP, controlPlane.Cluster); err != nil {
+			return errors.Wrapf(err, "failed to update Rke2Config %s", klog.KObj(rke2Config))
+		}
+	}
+	// Update the patch helpers.
+	controlPlane.SetPatchHelpers(patchHelpers)
+
+	return nil
+}

controlplane/internal/controllers/rke2controlplane_controller_test.go

@@ -7,7 +7,6 @@ import (
 	. "github.com/onsi/gomega"
 	bootstrapv1 "github.com/rancher/cluster-api-provider-rke2/bootstrap/api/v1beta1"
 	controlplanev1 "github.com/rancher/cluster-api-provider-rke2/controlplane/api/v1beta1"
-
 	// "github.com/rancher/cluster-api-provider-rke2/pkg/kubeconfig"
 	"github.com/rancher/cluster-api-provider-rke2/pkg/rke2"
 	corev1 "k8s.io/api/core/v1"